Sean McGivern e51816ff8e Merge branch 'backport-merge_params-conflict-message-to-ce-master' into 'master' ... Backport merge_params.html.haml conflict comment See merge request !12138		2017-06-15 08:41:20 +00:00
..
abuse_report_mailer
abuse_reports
admin	Help landing page customizations	2017-06-14 11:40:21 -04:00
award_emoji	rename "Add emoji" and "Award emoji" to "Add reaction" where appropriate	2017-05-19 17:50:20 -05:00
ci
dashboard	Refactor atom builder by using xml.atom layout	2017-06-12 19:21:13 +02:00
devise	Revert "Remove changes that are not absolutely necessary"	2017-05-24 20:59:26 +00:00
discussions	Fix title of discussion jump button at top of page	2017-05-26 17:27:16 -05:00
doorkeeper
email_rejection_mailer
errors
events	Consistently display last push event widget	2017-05-25 15:21:30 -05:00
explore
groups	Refactor atom builder by using xml.atom layout	2017-06-12 19:21:13 +02:00
help	Help landing page customizations	2017-06-14 11:40:21 -04:00
import
invites
issues
kaminari/gitlab
koding
layouts	Merge branch 'fix/33584-atom-layout' into 'master'	2017-06-13 08:49:13 +00:00
notify	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	2017-05-26 18:25:32 +08:00
peek/views	DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file	2017-06-09 17:21:39 +02:00
profiles	Sync email address from specified omniauth provider	2017-06-07 11:13:57 -04:00
projects	Implement diff viewers	2017-06-14 10:12:21 -05:00
repository_check_mailer
search	Create a separate helper to check if we show particular tab on a search page	2017-05-29 19:59:24 +03:00
sent_notifications	Fixed style on unsubscribe page	2017-06-03 17:06:44 +02:00
shared	Improve conflict message in _merge_params.html.haml	2017-06-14 15:05:07 +00:00
sherlock
snippets	Added more actions and report as abuse to all notes	2017-06-07 18:33:50 +00:00
u2f
users	Refactor atom builder by using xml.atom layout	2017-06-12 19:21:13 +02:00