Grzegorz Bizon 57906a5322 Merge branch 'gitaly-conflict-resolver' into 'master' ... Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755		2018-01-03 08:39:16 +00:00
..
assets	Merge branch '41357-empty-state-mr' into 'master'	2018-01-03 01:32:17 +00:00
controllers	Allow logged in user to change his password	2017-12-31 19:59:07 -05:00
finders	Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clusters	2017-12-05 13:29:41 +01:00
helpers	Merge branch 'jivl-general-icons-2' into 'master'	2017-12-22 10:59:48 +00:00
mailers	Make discussion mail References all notes in the discussion	2017-12-13 21:26:01 +01:00
models	Fix user membership destroy relation	2018-01-02 15:06:44 +00:00
policies	Refactor common protected ref check	2017-12-12 15:07:24 -08:00
presenters	Present member collection at the controller level	2017-12-12 18:14:58 +01:00
serializers	Fall back to the MergeRequestWidgetEntity	2017-12-21 15:35:54 +01:00
services	Merge branch 'gitaly-conflict-resolver' into 'master'	2018-01-03 08:39:16 +00:00
uploaders	Support uploads for groups	2017-12-07 12:27:52 +01:00
validators	Second iteration of Move Kubernetes from service to Cluster page	2017-12-05 12:00:02 +00:00
views	Resolve "Modify the empty state of changes in MR"	2018-01-03 01:30:46 +00:00
workers	Merge branch '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted' into 'master'	2017-12-20 12:22:51 +00:00