Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb

2015-01-29 11:34:43 -08:00

..

admin

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

2015-01-21 17:05:31 -08:00

explore

Factor abilities methods

2014-10-19 11:12:39 +02:00

groups

Hide ldap group links if ldap is not enabled

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

oauth

Application admin scaffold

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

profiles

Rework oauth2 feature

2014-12-25 18:35:04 +02:00

projects

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

2015-01-29 11:34:43 -08:00

application_controller.rb

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

2015-01-29 11:34:43 -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

Refactor issuable list pages

2014-12-24 11:04:33 +02:00

files_controller.rb

Implements drag and drop upload in creating issues

2014-05-23 16:22:42 +08:00

github_imports_controller.rb

Merge pull request #8607 from skburgart/fix-typos

2015-01-21 23:02:48 -08:00

groups_controller.rb

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

help_controller.rb

Render images in help pages.

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

namespaces_controller.rb

Add users to /:id route

2014-06-07 15:06:55 +03:00

omniauth_callbacks_controller.rb

Merge remote-tracking branch 'ee/master' into ce-non-conflict

2015-01-13 18:22:38 -08:00

passwords_controller.rb

Use ruby 1.9 hash syntax

2015-01-23 17:41:10 -08:00

profiles_controller.rb

Rework oauth2 feature

2014-12-25 18:35:04 +02:00

projects_controller.rb

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

2015-01-29 11:34:43 -08:00

registrations_controller.rb

Merge pull request #7925 from cirosantilli/unused-arguments

2015-01-15 14:42:03 -08: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

Sanitize snippet file name in raw headers

2014-12-12 13:28:48 +02:00

unsubscribes_controller.rb

Send email notifying user he has been unsubscribed.

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

users_controller.rb

Cleanup and make contribution calendar faster

2015-01-29 00:53:43 -08:00