Dmitriy Zaporozhets 860a80ea57 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	app/assets/stylesheets/common.scss
	db/schema.rb

2013-08-16 14:37:51 +03:00

..

admin

Fix typos

2013-07-29 12:47:06 +02:00

profiles

Show correct group membership in profile

2013-08-06 18:03:13 +03:00

projects

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

2013-08-12 13:47:02 +03:00

public

Fix hardcoded condition and unassigned vars

2013-07-29 16:51:04 +03:00

application_controller.rb

do ldap access check only if current_user defined

2013-08-10 18:15:51 +03:00

dashboard_controller.rb

REmove duplicating search on dashboard issues/mr

2013-07-12 21:49:03 +03:00

errors_controller.rb

No gitolite in project any more

2013-02-11 19:16:59 +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/gitlab-ee

2013-07-19 15:11:02 +03:00

help_controller.rb

Show shotcut dialog on ?

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

omniauth_callbacks_controller.rb

Update ldap user permissions on each login

2013-08-05 15:31:04 +03:00

profiles_controller.rb

Sanitize user attrs on model level

2013-07-10 13:48:03 +03:00

projects_controller.rb

Ensure project discover default branch on Project#show

2013-08-15 12:27:19 +03:00

registrations_controller.rb

Add settings for user permission defaults

2013-05-16 18:02:22 +04:00

search_controller.rb

Fix paginate of blobs, fixed preserve in dev mode for blob results

2013-05-14 20:25:16 +03:00

snippets_controller.rb

Use navless layout for snippets page

2013-06-18 17:43:49 +03:00

users_controller.rb

Remove form for adding user to several projects from admin area.

2013-06-22 13:41:08 +03:00

users_groups_controller.rb

Ability to edit group member permissions

2013-08-06 18:45:45 +03:00