gitlab-org--gitlab-foss/spec
Sean McGivern f7537ce03a Merge branch 'issue_39773_be' into 'master'
Prevent fast forward merge when rebase is required

Closes #39773

See merge request gitlab-org/gitlab-ce!15296
2017-11-10 14:55:39 +00:00
..
bin
config
controllers Fix access to the final page of todos 2017-11-09 13:13:48 +00:00
db/production
factories Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into add-ingress-to-cluster-applications 2017-11-07 17:54:03 +01:00
features Merge branch 'cleanup-issues-schema' into 'master' 2017-11-10 11:26:32 +00:00
finders
fixtures Merge branch 'master' into 38464-k8s-apps 2017-11-07 21:23:54 +09:00
helpers Merge branch 'tz-no-cdn-for-svg-sprites' into 'master' 2017-11-10 09:28:15 +00:00
initializers Fix rspec errors, and add more tests to MethodCall and ActionView 2017-11-02 18:11:43 +01:00
javascripts Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master' 2017-11-09 19:48:38 +00:00
lib Prepare Repository#fetch_source_branch for migration 2017-11-10 14:45:23 +00:00
mailers
migrations Move migration file to post-migration. Use EachBatch. batch_size 1 2017-11-04 03:22:04 +09:00
models Always return full avatar URL for private/internal groups/projects when asset host is set 2017-11-09 15:40:41 +00:00
policies
presenters
requests Add /groups/:id/subgroups endpoint to API 2017-11-09 16:07:04 +00:00
routing Merge branch 'feature-change-signout-route' into 'master' 2017-11-08 09:28:50 +00:00
rubocop/cop
serializers Merge branch 'master' into 38464-k8s-apps 2017-11-08 01:46:53 +09:00
services Prevent fast forward merge when rebase is required 2017-11-10 12:01:09 -02:00
sidekiq/cron
support Merge branch '36099-api-responses-missing-x-content-type-options-header' into '10-1-stable' 2017-11-08 20:11:18 -08:00
tasks
unicorn
uploaders
validators Reallow project paths ending in periods 2017-11-06 14:46:53 +01:00
views Merge branch '37824-many-branches-lock-server' into 'master' 2017-11-07 21:49:27 +00:00
workers Rewrite the GitHub importer from scratch 2017-11-07 23:24:59 +01:00
factories_spec.rb
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb Merge branch 'master' into sh-headless-chrome-support 2017-11-02 17:05:06 -05:00