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

Conflicts:
	app/services/merge_requests/build_service.rb
	app/views/layouts/_head.html.haml

2015-02-20 16:02:25 -08:00

..

admin

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

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

explore

Respect star ordering on explore page

2015-02-18 16:40:22 -08:00

groups

Hide ldap group links if ldap is not enabled

2014-12-08 15:45:55 +02:00

import

Add gitorious.org importer

2015-02-20 17:42:58 +00:00

oauth

Application admin scaffold

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

profiles

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

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

projects

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

2015-02-20 16:02:25 -08:00

application_controller.rb

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

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

audit_events_controller.rb

Add audit events feature spec for project.

2014-11-20 11:54:05 +01:00

confirmations_controller.rb

Try signing in the user after user confirmation is correct and redirect to dashboard, otherwise redirect to signin page

2014-10-02 14:38:26 +02:00

dashboard_controller.rb

Fix event loading with associations

2015-02-18 09:38:46 -08:00

files_controller.rb

Revert "Fix broken access control and refactor avatar upload"

2015-02-19 08:57:35 -08:00

groups_controller.rb

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

2015-02-18 17:44:29 -08:00

help_controller.rb

Render images in help pages.

2014-07-15 11:28:46 +02:00

namespaces_controller.rb

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08: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

Use shorter map() syntax

2015-02-15 20:50:53 -07:00

projects_controller.rb

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

2015-02-18 17:44:29 -08:00

registrations_controller.rb

Redirect signup page to signin page.

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

search_controller.rb

Merge pull request #7695 from coverer/search_wiki

2014-09-09 16:50:43 +03:00

sessions_controller.rb

Improve application settings and write tests

2015-01-08 09:53:35 -08:00

snippets_controller.rb

Link head panel titles to relevant root page.

2015-02-13 14:31:51 +01:00

unsubscribes_controller.rb

Send email notifying user he has been unsubscribed.

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

uploads_controller.rb

Use controllers to serve uploads, with XSS prevention and access control.

2015-02-20 13:13:48 +01:00

users_controller.rb

Fix user page performance and authorization

2015-02-18 13:28:24 -08:00