Download as
Browse Code »

Commit 1ce50b41782ddd9017b7413443e42493a9b37b4e

Authored by Victor Costa
2 parents 39a8005d 9d1d73d6
Exists in staging and in 2 other branches api-homepage, production

Merge branch 'master' into staging

Showing 4 changed files with 17 additions and 1 deletions   Show diff stats
debian/changelog
  Diff comments   View file @1ce50b4
  1 +noosfero (1.4~rc3) jessie-test; urgency=medium
  2 +
  3 + * Noosfero 1.4 RC3
  4 +
  5 + -- Antonio Terceiro <terceiro@colivre.coop.br> Thu, 28 Jan 2016 16:58:32 -0200
  6 +
1 noosfero (1.4~rc2) jessie-test; urgency=medium 7 noosfero (1.4~rc2) jessie-test; urgency=medium
2 8
3 * Noosfero 1.4 RC2 9 * Noosfero 1.4 RC2
lib/noosfero/version.rb
  Diff comments   View file @1ce50b4
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '1.4~rc2' 3 + VERSION = '1.4~rc3'
4 end 4 end
5 5
6 root = File.expand_path(File.dirname(__FILE__) + '/../..') 6 root = File.expand_path(File.dirname(__FILE__) + '/../..')
plugins/oauth_client/lib/ext/user.rb
  Diff comments   View file @1ce50b4
@@ -9,6 +9,7 @@ class User @@ -9,6 +9,7 @@ class User
9 after_create :store_oauth_providers 9 after_create :store_oauth_providers
10 10
11 def initialize_with_oauth_client(attributes = {}, options = {}) 11 def initialize_with_oauth_client(attributes = {}, options = {})
  12 + attributes ||= {}
12 @oauth_providers = attributes.delete(:oauth_providers) || [] 13 @oauth_providers = attributes.delete(:oauth_providers) || []
13 initialize_without_oauth_client(attributes, options) 14 initialize_without_oauth_client(attributes, options)
14 end 15 end
plugins/oauth_client/test/functional/oauth_client_plugin_account_controller_test.rb 0 → 100644
  Diff comments   View file @1ce50b4
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +require 'test_helper'
  2 +
  3 +class AccountControllerTest < ActionController::TestCase
  4 +
  5 + should 'render signup page' do
  6 + get :signup
  7 + end
  8 +
  9 +end