Clement Ho aa4942a213 Merge branch 'master' into 'bootstrap4' ... # Conflicts: # app/helpers/issuables_helper.rb # app/views/projects/_home_panel.html.haml # app/views/projects/commits/_commit.html.haml		2018-04-09 17:04:05 +00:00
..
assets	Merge branch 'master' into 'bootstrap4'	2018-04-09 17:04:05 +00:00
controllers
finders
helpers	Add badge-pill to .badge in haml	2018-04-09 11:33:41 -05:00
mailers
models	Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master'	2018-04-09 15:36:56 +00:00
policies
presenters
serializers
services
uploaders
validators
views	Merge branch 'master' into 'bootstrap4'	2018-04-09 17:04:05 +00:00
workers	Work around Ruby 2.3.7 bug by defining prepended class methods needed for tests	2018-04-09 06:46:33 -07:00