Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
	db/schema.rb

2015-04-20 19:19:27 +03:00

..

admin

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-15 19:22:57 +03:00

dashboard

Move group leave action from dashboard/groups to groups/group_members.

2015-03-15 13:52:28 +01:00

explore

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

groups

Fix conflict

2015-04-15 20:22:23 +03:00

import

Don't save unchanged user map items to the DB.

2015-04-17 13:32:29 +02:00

oauth

Application admin scaffold

2015-01-17 15:40:09 -08:00

profiles

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-15 19:22:57 +03:00

projects

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-04-20 19:19:27 +03:00

application_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-15 19:22:57 +03:00

audit_events_controller.rb

Authorization rule manage_group does not exist any more

2015-04-16 13:36:32 +03:00

autocomplete_controller.rb

Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-14 13:05:39 +03:00

confirmations_controller.rb

Add invites controller.

2015-04-14 12:07:33 +02:00

dashboard_controller.rb

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

groups_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

help_controller.rb

Loosen help page parameter constraints for category

2015-04-15 13:15:18 -04:00

invites_controller.rb

Follow newline guidelines.

2015-04-14 15:16:00 +02:00

namespaces_controller.rb

Don't leak private group existence by redirecting from namespace controller to group controller.

2015-03-24 15:55:12 +01:00

omniauth_callbacks_controller.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

passwords_controller.rb

Use ruby 1.9 hash syntax

2015-01-23 17:41:10 -08:00

profiles_controller.rb

Allow user to choose which email to be public

2015-04-14 19:42:48 +08:00

projects_controller.rb

Merge remote-tracking branch 'dev/master' into ce_upstream1

2015-03-12 18:39:24 +02:00

registrations_controller.rb

Redirect signup page to signin page.

2015-02-05 15:56:28 +01:00

search_controller.rb

Don't leak existence of group or project via search.

2015-04-10 18:40:39 +02:00

sessions_controller.rb

Upon successful login, clear reset_password_token field

2015-04-08 16:06:56 -04:00

snippets_controller.rb

Merge branch 'master' into fix-restricted-visibility

2015-03-14 10:49:11 -06:00

unsubscribes_controller.rb

Send email notifying user he has been unsubscribed.

2014-08-26 17:15:43 +02:00

uploads_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-11 18:41:41 -07:00

users_controller.rb

Merge branch 'userpage-activity-scroll'

2015-03-23 09:45:40 -07:00