Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev ...

Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb

2013-07-02 11:47:09 +03:00

..

admin

fixed typo in assgned

2013-06-29 16:37:41 +03:00

profiles

Better design for SSH keys page

2013-06-24 19:25:10 +03:00

projects

Merge branch 'master' into 6-0-dev

2013-07-02 11:47:09 +03:00

public

Add simple search to projects in public area

2013-05-13 21:18:08 +03:00

application_controller.rb

Migrate global project taks. Removed more teams related functionality

2013-06-19 19:48:48 +03:00

dashboard_controller.rb

Remove second search. More compact list. Additional filter

2013-06-19 17:48:43 +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

prevent document unbind since it breaks rails ujs

2013-06-21 23:47:42 +03:00

help_controller.rb

Show shotcut dialog on ?

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

omniauth_callbacks_controller.rb

Update uses of Gitolite.config.foo settings

2012-12-20 16:54:28 +01:00

profiles_controller.rb

Dont allow LDAP users to change password inside GitLab

2013-05-24 17:12:27 +03:00

projects_controller.rb

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +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

You should not be able to remove a Group owner

2013-06-22 11:02:31 +03:00