gitlab-org--gitlab-foss/spec
Sean McGivern 36838a843e Merge branch 'master' into '3867-port-to-ce'
# Conflicts:
#   db/schema.rb
2018-02-02 11:58:32 +00:00
..
bin
config
controllers port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
db/production
factories porting changes from upstream 2018-02-01 15:08:35 -05:00
features Merge branch 'master' into fl-mr-widget-1 2018-02-01 17:53:26 +00:00
finders Include subgroup issuables on the group page 2018-02-01 07:04:37 +01:00
fixtures Fix a JSON schema that doesn't include enough fields 2018-01-31 18:31:21 +01:00
helpers Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
initializers Fix grape-route-helper route shadowing 2018-01-29 15:28:14 -06:00
javascripts Merge branch 'fl-mr-widget-1' into 'master' 2018-02-02 10:25:26 +00:00
lib Merge branch 'master' into '3867-port-to-ce' 2018-02-02 11:58:32 +00:00
mailers Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
migrations Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' 2018-01-24 17:25:55 +00:00
models port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
policies Merge branch '35285-user-interface-bugs-for-schedule-pipelines' into 'master' 2018-02-01 18:01:43 +00:00
presenters Backport 'Rebase' feature from EE to CE 2018-01-05 09:34:59 +01:00
requests port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
routing
rubocop/cop Make sure it's not offending to use local ||= val 2018-01-13 00:24:12 +08:00
serializers Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3' 2018-01-16 17:04:51 -08:00
services port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
sidekiq/cron
support port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
tasks Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
unicorn
uploaders porting changes from upstream 2018-02-01 15:08:35 -05:00
validators
views Hide pipeline schedule 'take ownership' for current owner 2018-02-01 17:25:13 +00:00
workers port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
factories_spec.rb Replace factory_girl_rails with factory_bot_rails 2017-12-14 15:01:55 +01:00
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb Ensure hooks are deleted regardless of the project forking method 2018-01-19 13:57:17 -03:00