Clement Ho f9e2b4730f Merge branch 'master' into 'bootstrap4' ... # Conflicts: # app/views/projects/branches/_branch.html.haml		2018-05-01 16:21:47 +00:00
..
assets	Merge branch 'master' into 'bootstrap4'	2018-05-01 16:21:47 +00:00
controllers	Merge request and commit discussions API	2018-05-01 12:39:44 +00:00
finders	show only groups an admin is a member of in dashboards/grops	2018-05-01 09:24:21 +00:00
helpers	Merge branch 'master' into 'bootstrap4'	2018-05-01 16:21:47 +00:00
mailers	Make avatar helpers available to emails	2018-04-26 11:28:02 +02:00
models	Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master'	2018-05-01 15:11:21 +00:00
policies	Fix users not seeing labels from private groups when being a member of a child project	2018-04-23 13:56:38 -03:00
presenters	Only show push-to-master authorized users	2018-04-24 13:59:41 +02:00
serializers	Resolve "Improve tooltips of collapsed sidebars"	2018-04-19 14:43:20 +00:00
services	Merge request and commit discussions API	2018-05-01 12:39:44 +00:00
uploaders	Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"	2018-04-23 16:59:53 +00:00
validators
views	Merge branch 'master' into 'bootstrap4'	2018-05-01 16:21:47 +00:00
workers	Merge branch 'move-notification-service-calls-to-sidekiq' into 'master'	2018-04-30 08:31:37 +00:00