delta/gitlab/gitlab-ce.git/app/models/concerns, branch ci-https

Introduce all_state_names so that we could avoid NOT IN

2016-10-04T16:10:23+00:00

Merge remote-tracking branch 'upstream/master' into all-skipped-equals-success

2016-10-04T15:57:43+00:00

* upstream/master: (55 commits)
  Restrict failed login attempts for users with 2FA
  Update RuboCop to 0.43.0 and update configuration
  Use SELECT 1, instead SELECT COUNT(*) to ask for notes existency
  Simplify Mentionable concern instance methods
  Fix issues importing services via Import/Export
  deployment refs in own folder, new method for creating refs
  Update method name
  Save a fetchable ref per deployement
  GrapeDSL for Namespace endpoint
  Remove SCSS rules for short hex chars.
  Fix bug when trying to cache closed issues from external issue trackers
  Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0.
  Remove useless code now that Member#add_user handles it
  Combine requestFileSuccess arguments into `opts`
  Append issue template to existing description
  Invert method's naming
  Fix a few things after the initial improvment to Members::DestroyService
  Improve Members::DestroyService
  Add Container Registry on/off status to admin area
  Enable Lint/StringConversionInInterpolation cop and autocorrect offenses
  ...

Simplify Mentionable concern instance methods

2016-10-04T08:45:48+00:00

We remove some arguments that are rarely used or 
used just to simplify setups on specs.

Modified Mentionable#create_new_cross_references method 
we don’t need to calculate previous references to avoid the 
duplication because we do that at database level when 
creating references extracted from the current entity state.

MergeRequests won’t create cross_references for commits that are included so we change a spec to use a different merge request to make references to commits to other branches

We don't need self. there. (sorry, can't resist anymore)

2016-10-03T11:49:53+00:00

Merge branch 'master' into all-skipped-equals-success

2016-10-03T11:46:59+00:00

* master: (103 commits)
  Fixes sidebar navigation.
  Convert "SSH Keys" Spinach features to RSpec
  Enable import/export back for non-admins
  Update gitlab-shell to 3.6.3
  Updated artwork of empty group state.
  Better empty state for Groups view.
  Members::RequestAccessService is tricter on permissions
  Add a /wip slash command
  Link to the "What requires downtime?" page from the Migration Style Guide
  Fix RuboCop failure in app/services/notification_service.rb
  Add word-wrap to issue title on issue and milestone boards
  Fix page scrolling to top on sidebar toggle
  Changed zero padded days to no padded days in date_format
  GrapeDSL for Keys endpoint
  Remove duplicate test
  Add a spec to verify comparison context inclusion in path when a version is chosen to compare against
  Add flash containers and broadcast messages below subnav
  Add white background to create MR banner
  Move create MR banner below subnav
  Remove contianer from last push widget
  ...

Fix tests. Check 'success' first (default status)

2016-10-03T11:35:53+00:00

Remove dead code

2016-10-03T10:35:36+00:00

Rename ignored to failed_but_allowed, introduce exclude_ignored

2016-10-03T10:22:51+00:00

which merges previous exclude_ignored_jobs and failed_but_allowed,
so that we don't treat ignored a special case in HasStatus.

Add a test for on_failure jobs in the middle

2016-10-01T06:38:39+00:00

on_failure should also be ignored, and status_sql should

2016-10-01T06:17:54+00:00

also respect this ignorance. Address feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6604#note_16273363