gitlab-org--gitlab-foss/spec
lulalala 7517105303 Add cannot_be_merged_recheck merge_status
First, transitions between can_be_merged & cannot_be_merged are removed,
as they are currently blocked in `check_if_can_be_merged`.
`can_be_merge` always returns to `unchecked` first,
before it can transition to `cannot_be_merged` (and vice versa).

We want to avoid repeated notification triggered by repeated transition
between `cannot_be_merged` & `unchecked`.

So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
but as a mean to remember it’s from cannot_be_merged.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407

Since `unchecked` and `cannot_be_merged_recheck` both mean
“we are in the middle of checking if it is mergeable”,
quite often we need to see if merge_status is in either one of them,
so `check_state?` is added to achieve this.
2018-05-17 08:54:47 +08:00
..
bin
config
controllers Add cannot_be_merged_recheck merge_status 2018-05-17 08:54:47 +08:00
db/production Enable prometheus metrics by default 2018-05-07 08:46:23 +00:00
factories Add DB constraint ci_runners.runner_type not null 2018-05-09 09:54:19 +02:00
features Add cannot_be_merged_recheck merge_status 2018-05-17 08:54:47 +08:00
finders show only groups an admin is a member of in dashboards/grops 2018-05-01 09:24:21 +00:00
fixtures Merge branch '43557-osw-present-merge-sha-commit' into 'master' 2018-05-07 22:17:55 +00:00
helpers Adjust spec to build correct path when storage path ends in slash 2018-05-09 12:56:03 +02:00
initializers Remove method call to deprecated method 2018-05-11 08:57:06 +02:00
javascripts Resolve "Remove modal box confirmation when retrying a pipeline" 2018-05-11 14:03:27 +00:00
lib Merge branch 'bvl-restrict-api-git-for-terms' into 'master' 2018-05-11 14:37:14 +00:00
mailers Backport 5480-epic-notifications from EE 2018-05-07 12:58:47 -06:00
migrations Merge branch 'master' into 'fix-project-mirror-data-schema' 2018-05-09 17:09:25 +00:00
models Add cannot_be_merged_recheck merge_status 2018-05-17 08:54:47 +08:00
policies Allows access_(git|api) to anonymous users 2018-05-10 17:02:27 +02:00
presenters
requests Allow triggered builds git access 2018-05-11 15:20:11 +02:00
routing
rubocop/cop
serializers Increase PipelineSerializer query limit count to support new group runner queries 2018-04-26 13:23:35 +08:00
services Add cannot_be_merged_recheck merge_status 2018-05-17 08:54:47 +08:00
sidekiq/cron
support Merge branch 'ce-5911-extract-ee-specific-files-lines-for-spec-models-clusters' into 'master' 2018-05-11 08:33:49 +00:00
tasks
unicorn
uploaders apply feedback 2018-05-09 19:57:08 +00:00
validators
views Backports every CE related change from ee-44542 to CE 2018-05-04 17:33:26 +02:00
workers Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master' 2018-05-07 15:15:57 +00:00
factories_spec.rb
fast_spec_helper.rb
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb Support resetting of Prometheus metrics between test runs 2018-05-09 14:33:42 -07:00