gitlab-org--gitlab-foss/spec
Douwe Maan 5db5a9cbd1 Merge branch 'master' into 'zj-wiki-page-versions'
# Conflicts:
#   Gemfile
#   Gemfile.lock
2018-02-06 16:08:06 +00:00
..
bin
config
controllers Merge branch 'winh-kubernetes-clusters' into 'master' 2018-02-06 15:57:48 +00:00
db/production
factories Revert using expand_fixture_path in factory 2018-02-06 15:50:08 +09:00
features Merge branch 'winh-kubernetes-clusters' into 'master' 2018-02-06 15:57:48 +00:00
finders Include subgroup issuables on the group page 2018-02-01 07:04:37 +01:00
fixtures Backport sample_trace in fixtures 2018-02-06 15:50:08 +09:00
helpers Refactor .show_gke_cluster_integration_callout? 2018-02-05 14:33:49 +01:00
initializers Fix grape-route-helper route shadowing 2018-01-29 15:28:14 -06:00
javascripts Merge branch 'winh-kubernetes-clusters' into 'master' 2018-02-06 15:57:48 +00:00
lib Merge branch 'bump-workhorse' into 'master' 2018-02-06 15:56:48 +00:00
mailers Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
migrations Add foreign keys to todos table. 2018-02-05 16:16:57 +01:00
models Merge branch 'master' into 'zj-wiki-page-versions' 2018-02-06 16:08:06 +00:00
policies Merge branch '35285-user-interface-bugs-for-schedule-pipelines' into 'master' 2018-02-01 18:01:43 +00:00
presenters
requests Refactor :trace to :trace_live in spec 2018-02-06 15:50:08 +09:00
routing
rubocop/cop
serializers
services Fix tests for Drop filename enforcement 2018-02-06 15:50:08 +09:00
sidekiq/cron
support Merge branch '24167__color_label' into 'master' 2018-02-02 19:26:14 +00:00
tasks Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
unicorn
uploaders Merge branch '14256-upload-destroy-removes-file' into 'master' 2018-02-06 15:19:35 +00:00
validators
views Hide pipeline schedule 'take ownership' for current owner 2018-02-01 17:25:13 +00:00
workers Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently 2018-02-06 15:50:08 +09:00
factories_spec.rb
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb