Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master' ...

Correctly determine MR diff base when MR has merge conflicts

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779

See merge request !2632

2016-01-28 21:08:41 +00:00

..

admin

Merge branch 'feature/check-against-rbl-only' into 'master'

2016-01-20 14:24:20 -05:00

ci

Allow subsequent validations in CI Linter

2016-01-11 13:37:31 +01:00

concerns

Fix MR diff 'Edit' button

2016-01-21 22:46:49 +01:00

dashboard

Don't pluck project IDs for events

2016-01-26 10:51:53 +01:00

explore

remove public field from namespace and refactoring

2016-01-04 16:00:29 +02:00

groups

Fix Error 500 when creating global milestones with Unicode characters

2015-12-05 00:04:44 -08:00

import

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

oauth

Move helpers back to original directory

2015-09-09 14:37:34 +02:00

profiles

Update wording for 2FA requirement notice

2016-01-23 17:56:18 -08:00

projects

Merge branch 'mr-merge-base' into 'master'

2016-01-28 21:08:41 +00:00

sherlock

Added Sherlock, a custom profiling tool for GitLab

2015-11-09 14:29:10 +01:00

abuse_reports_controller.rb

Autofill abuse message text with user url. Closes #2838

2016-01-16 10:47:12 -05:00

application_controller.rb

Make default sorting preference work for Issues and MRs.

2016-01-22 18:43:21 -05:00

autocomplete_controller.rb

Update autocomplete_controller to be more readable

2015-11-22 06:04:20 -02:00

confirmations_controller.rb

Add invites controller.

2015-04-14 12:07:33 +02:00

dashboard_controller.rb

Don't pluck project IDs for events

2016-01-26 10:51:53 +01:00

groups_controller.rb

Merge branch 'events-performance' into 'master'

2016-01-27 21:20:16 +00:00

help_controller.rb

Simplify help path prefixing

2015-09-23 00:24:17 -04:00

invites_controller.rb

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

namespaces_controller.rb

Allow access to group from root url

2015-09-14 11:16:54 +02:00

omniauth_callbacks_controller.rb

Backport LDAP user assignment changes from EE

2016-01-28 13:31:48 -05:00

passwords_controller.rb

Use devise paranoid mode and ensure the same message is returned every time

2015-12-09 18:40:37 -06:00

profiles_controller.rb

Notify user if they cannot create projects

2015-12-05 11:32:08 -05:00

projects_controller.rb

Merge gitlab.com:gitlab-org/gitlab-ce

2016-01-06 14:55:44 +01:00

registrations_controller.rb

Add IP blocking against DNSBL at sign-up

2016-01-20 15:28:19 +01:00

root_controller.rb

Add user preference to view project activity and starred project activity as default dashboard

2015-09-26 08:46:05 -07:00

search_controller.rb

Add support for searching commit log messages

2015-10-28 22:34:39 -04:00

sent_notifications_controller.rb

#can_unsubscribe? -> #?unsubscribable?

2016-01-11 14:23:45 +01:00

sessions_controller.rb

Skip the 2FA requirement during logout

2016-01-23 16:44:46 -08:00

snippets_controller.rb

Fix raw private snippets access workflow

2015-11-25 18:16:27 -02:00

uploads_controller.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

users_controller.rb

remove public field from namespace and refactoring

2016-01-04 16:00:29 +02:00