gitlab-org--gitlab-foss/app
Douwe Maan 4dfd4e0366 Merge branch 'fix-bad-merge' into 'master'
Fix bad merge

/cc: @dzaporozhets 

See merge request !2116
2015-12-16 16:48:30 +00:00
..
assets Merge branch 'control-list-right-margin' into 'master' 2015-12-16 16:07:06 +00:00
controllers Merge branch 'fix-endpoint-not-setting-var' into 'master' 2015-12-16 16:39:35 +00:00
finders sort milestones by due_date 2015-12-03 08:53:34 -06:00
helpers Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:37:04 +01:00
mailers Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
models Fix bad merge 2015-12-16 08:02:28 -08:00
services Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
uploaders Expose artifacts path 2015-11-23 13:05:22 +01:00
validators Inline Gitlab::Blacklist in NamespaceValidator 2015-12-07 16:57:26 -05:00
views Merge branch 'issuable-sidebar' into 'master' 2015-12-16 15:54:10 +00:00
workers Migrate CI WebHooks and Emails to new tables 2015-12-10 16:04:08 +01:00