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

Conflicts:
	app/helpers/oauth_helper.rb
	db/schema.rb

2015-03-21 20:41:10 -07:00

..

admin

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

dashboard

Move group leave action from dashboard/groups to groups/group_members.

2015-03-15 13:52:28 +01:00

explore

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

groups

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

import

Merge branch 'github-org-repos' into 'master'

2015-03-12 17:13:25 +00:00

oauth

Application admin scaffold

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

profiles

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

2015-03-21 20:41:10 -07:00

projects

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

2015-03-20 15:51:47 -07:00

application_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07: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

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

groups_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

help_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-11 18:41:41 -07: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

Merge branch 'user-location' into 'master'

2015-03-21 00:54:03 +00:00

projects_controller.rb

Merge remote-tracking branch 'dev/master' into ce_upstream1

2015-03-12 18:39:24 +02:00

registrations_controller.rb

Redirect signup page to signin page.

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

search_controller.rb

Only trigger actual search if a search string is present

2015-03-19 10:50:34 +01:00

sessions_controller.rb

Improve application settings and write tests

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

snippets_controller.rb

Merge branch 'master' into fix-restricted-visibility

2015-03-14 10:49:11 -06:00

unsubscribes_controller.rb

Send email notifying user he has been unsubscribed.

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

uploads_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-11 18:41:41 -07:00

users_controller.rb

Extend the commit calendar to show the actual commits for a date

2015-03-18 08:42:42 +01:00