Merge branch 'staging' into production

Leandro Santos
2 parents ce019365 e363fa27
Showing 3 changed files with 1 additions and 3 deletions Show diff stats
lib/noosfero/api/entities.rb
plugins/juventude
public/designs/themes/cube-responsive/theme.yml
@@ -66,7 +66,6 @@ module Noosfero
       class Person < Profile
         root 'people', 'person'
         expose :user, :using => UserBasic, documentation: {type: 'User', desc: 'The user data of a person' }
-        expose :orientacao_sexual, :identidade_genero, :transgenero, :etnia
       end
  
       class Enterprise < Profile
-Subproject commit 1aa48652e63b9fc1a29002ede8df2a1906b2d7bc
+Subproject commit e676cf9a4966921609b451dc10ad6624282285da
@@ -2,4 +2,3 @@ name: &quot;Noosfero responsive some Bootstrap styling&quot;
 layout: "application-responsive"
 icon_theme: [awesome, pidgin]
 responsive: true
-public: true
...	...	@@ -66,7 +66,6 @@ module Noosfero
66	66	class Person < Profile
67	67	root 'people', 'person'
68	68	expose :user, :using => UserBasic, documentation: {type: 'User', desc: 'The user data of a person' }
69		- expose :orientacao_sexual, :identidade_genero, :transgenero, :etnia
70	69	end
71	70
72	71	class Enterprise < Profile
...	...
1		-Subproject commit 1aa48652e63b9fc1a29002ede8df2a1906b2d7bc
	1	+Subproject commit e676cf9a4966921609b451dc10ad6624282285da
...	...
...	...	@@ -2,4 +2,3 @@ name: "Noosfero responsive some Bootstrap styling"
2	2	layout: "application-responsive"
3	3	icon_theme: [awesome, pidgin]
4	4	responsive: true
5		-public: true
...	...