Jacob Schatz 4371f84564 Merge branch 'remove-merge-conflicts-bundle' into 'master' ... Remove merge_conflicts bundle See merge request gitlab-org/gitlab-ce!17408		2018-02-28 02:42:42 +00:00
..
assets	Merge branch 'remove-merge-conflicts-bundle' into 'master'	2018-02-28 02:42:42 +00:00
controllers	Render MR Notes with Vue with behind a cookie	2018-02-28 00:10:43 +00:00
finders	Allow to find labels in ancestor groups and better group support in label service	2018-02-26 16:23:19 +00:00
helpers	Render MR Notes with Vue with behind a cookie	2018-02-28 00:10:43 +00:00
mailers	Add DNS verification to Pages custom domains	2018-02-23 12:22:29 +00:00
models	Render MR Notes with Vue with behind a cookie	2018-02-28 00:10:43 +00:00
policies	Port read_cross_project ability from EE	2018-02-22 17:11:36 +01:00
presenters	Use select instead reject	2018-02-22 13:59:15 -03:00
serializers	Render MR Notes with Vue with behind a cookie	2018-02-28 00:10:43 +00:00
services	Improve Member services	2018-02-27 16:02:22 +01:00
uploaders	Fix 500 error when loading an invalid upload URL	2018-02-22 14:32:01 +00:00
validators	Skip variables duplicates validator if variable is already a duplicate	2018-02-22 23:09:24 +01:00
views	Merge branch 'remove-merge-conflicts-bundle' into 'master'	2018-02-28 02:42:42 +00:00
workers	Improve Member services	2018-02-27 16:02:22 +01:00