Sean McGivern 9c12cb5375 Merge branch 'gitaly-conflicts-prep' into 'master' ... Simplify conflict resolver interface See merge request gitlab-org/gitlab-ce!15897		2017-12-15 10:59:21 +00:00
..
bin	Move the circuitbreaker check out in a separate process	2017-12-08 09:11:39 +01:00
config
controllers	Merge branch 'single-list-multiple-clusters' into 'master'	2017-12-12 14:17:14 +00:00
db/production
factories	Adds ordering to projects contributors in API	2017-12-13 18:02:20 +01:00
features	Merge branch 'lfs-badge' into 'master'	2017-12-15 09:02:24 +00:00
finders
fixtures	clearer-documentation-on-inline-diffs	2017-12-14 18:14:23 +00:00
helpers	Merge branch 'lfs-badge' into 'master'	2017-12-15 09:02:24 +00:00
initializers
javascripts	Converted JS modules into exported modules	2017-12-14 11:50:40 +00:00
lib	Import gitlab_projects.rb from gitlab-shell	2017-12-14 16:00:04 +00:00
mailers	Make discussion mail References all notes in the discussion	2017-12-13 21:26:01 +01:00
migrations	Create models directly in migration specs	2017-12-12 09:44:21 +01:00
models	Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'	2017-12-14 18:58:38 +00:00
policies	Support uploads for groups	2017-12-07 12:27:52 +01:00
presenters	Present member collection at the controller level	2017-12-12 18:14:58 +01:00
requests	sorting for tags api	2017-12-14 13:42:15 +00:00
routing
rubocop/cop	Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't manually set their queue	2017-12-13 16:28:26 +01:00
serializers	Use actual head pipeline on merge request serializer	2017-12-05 12:54:10 -02:00
services	Merge branch 'gitaly-conflicts-prep' into 'master'	2017-12-15 10:59:21 +00:00
sidekiq/cron
support	Import gitlab_projects.rb from gitlab-shell	2017-12-14 16:00:04 +00:00
tasks	Remove Rugged::Repository#empty?	2017-12-07 15:33:30 +00:00
unicorn
uploaders	Support uploads for groups	2017-12-07 12:27:52 +01:00
validators
views	spec fixes	2017-12-14 11:31:50 +00:00
workers	Merge branch 'dm-dedicated-sidekiq-queues' into 'master'	2017-12-14 10:15:52 +00:00
factories_spec.rb
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb	Move the circuitbreaker check out in a separate process	2017-12-08 09:11:39 +01:00