Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml

2014-05-12 12:39:51 +03:00

..

admin

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9

2014-05-12 12:39:51 +03:00

groups

UI and controller for group members access reset

2014-02-20 12:26:48 +02:00

profiles

Allow oauth signup without email

2014-04-07 14:09:29 +03:00

projects

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9

2014-05-12 12:39:51 +03:00

public

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

application_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8

2014-04-10 13:34:56 +03:00

dashboard_controller.rb

Show link to public projects for new users.

2014-03-17 13:02:04 +01: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 code-from-ce-6-7

2014-03-18 11:15:01 +02:00

help_controller.rb

Show shotcut dialog on ?

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

omniauth_callbacks_controller.rb

Synchronize user email with ldap.

2014-04-04 13:08:28 +02:00

passwords_controller.rb

Do not allow password reset for ldap user.

2014-03-18 12:25:49 +01:00

profiles_controller.rb

Allow oauth signup without email

2014-04-07 14:09:29 +03:00

projects_controller.rb

Correct identation, default value if note doesn't exist.

2014-03-25 18:53:09 +01: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

Fix global search

2014-03-14 14:41:28 +02:00

snippets_controller.rb

Render 404 instead of 500 if trying to see snippets of unexisting user

2014-03-14 15:55:41 +02:00

users_controller.rb

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

users_groups_controller.rb

User can leave group from group page.

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