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	…
groups	…
import	…
oauth	…
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	…
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	…
confirmations_controller.rb	…
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	…
invites_controller.rb	…
namespaces_controller.rb	…
omniauth_callbacks_controller.rb	Backport LDAP user assignment changes from EE	2016-01-28 13:31:48 -05:00
passwords_controller.rb	…
profiles_controller.rb	…
projects_controller.rb	…
registrations_controller.rb	Add IP blocking against DNSBL at sign-up	2016-01-20 15:28:19 +01:00
root_controller.rb	…
search_controller.rb	…
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	…
uploads_controller.rb	…
users_controller.rb	…