Dmitriy Zaporozhets cf413ffb75 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6 ...

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

Conflicts:
	LICENSE
	VERSION
	db/schema.rb
	features/steps/group/group.rb
	lib/api/internal.rb

2014-02-19 14:55:07 +02:00

..

admin

Remove deprecated finders

2014-01-19 23:39:56 +04:00

groups

added group avatars

2014-01-28 08:38:00 +01:00

profiles

Add email aliases for users

2014-02-13 22:59:39 -06:00

projects

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

2014-02-19 14:55:07 +02:00

public

Sort dropdown for Dashboard#projects page

2013-12-29 12:58:00 +02:00

application_controller.rb

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

2014-02-19 14:55:07 +02:00

dashboard_controller.rb

Fix wrong issues appears at Dashboard#issues page

2014-02-10 15:04:52 +02:00

files_controller.rb

Files controller handle redirect to remote storage. Added config block to carrierwave init

2013-05-15 22:35:59 +03:00

groups_controller.rb

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

2014-02-19 14:55:07 +02:00

help_controller.rb

Show shotcut dialog on ?

2013-06-30 22:10:52 +03:00

omniauth_callbacks_controller.rb

LDAP user filter option in gitlab.yml

2013-10-01 14:45:21 +03:00

profiles_controller.rb

Read-only email field for LDAP user

2013-11-27 10:32:37 +02:00

projects_controller.rb

Move all Context classes into Services

2014-01-16 19:03:42 +02:00

registrations_controller.rb

Fix user remove tests. Remove user even if he has projects

2013-09-04 16:20:40 +03:00

search_controller.rb

Merge pull request #6075 from skv-headless/remove_deprecated_finders

2014-01-22 11:04:56 -08:00

snippets_controller.rb

Remove deprecated finders

2014-01-19 23:39:56 +04:00

users_controller.rb

User pages are visible to users without login

2014-02-11 15:45:30 +01:00

users_groups_controller.rb

User can leave group from group page.

2014-02-12 15:52:53 +01:00