delta/gitlab/gitlab-ce.git/spec/controllers, branch update-csslab-version

Merge branch '43770-change-clear-runners-cache-ujs-action-to-an-axios-request' into 'master'

2018-03-08T09:30:01+00:00

Resolve "Change Clear Runners cache UJS action to an API request"

Closes #43770

See merge request gitlab-org/gitlab-ce!17466

Merge branch 'ce-jej/github-project-service-for-ci' into 'master'

2018-03-08T00:39:27+00:00

Backport changes from introducing GithubService interation in EE

See merge request gitlab-org/gitlab-ce!17607

[ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-action-to-an-axios-request

2018-03-07T18:42:57+00:00

* master: (68 commits)
  Upgrade Workhorse to 4.0.0
  naming things
  Update GitLab Pages to v0.7.0
  Minor fixes in API doc
  Use Project#full_name instead of name_with_namespace
  Fix tests not completely disabling Gitaly
  Move OperationService#UserRemoveBranch
  Move OperationService#UserCreateBranch
  Move CommitService#Languages to OPT_OUT
  Move RefService#CreateBranch to OPT_OUT
  Move RefService#DeleteBranch to OPT_OUT
  Move OperationService#UserRevert to OPT_OUT
  Move OperationService#UserAddTag to OPT_OUT
  Move CommitService::CommitPatch to OPT_OUT
  Change to Pacific Time Zone
  Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5'
  Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'
  Remove wrong assumption about Runners cache GC
  Add CommonMark markdown engine
  add nginx_status monitoring details
  ...

Service integration displays validation errors on test fail

2018-03-07T17:50:11+00:00

Fixes attempts to update a service integration which had `can_test?`
set to true but validations were causing the "Test and save changes"
button to return "Something went wrong on our end."

Removes references to index action left from 0af99433143727088b6a0a1b2163751c05d80ce6

Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'

2018-03-07T16:43:29+00:00

Resolve: Modal and banner designs for project label and project milestone promotion

Closes #41895

See merge request gitlab-org/gitlab-ce!17197

[ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-action-to-an-axios-request

2018-03-07T09:48:44+00:00

* master: (97 commits)
  Remove common_vue bundle
  Gitlab::Utils - backport `.ensure_array_from_string` from EE
  Fix false positive spec of using digest instead of hexdigest
  Change queue namespace of UpdateHeadPipelineForMergeRequestWorker
  prefer checking explicitly for null
  replace fixture with simple mount point
  add new tests for metrics dashboard changes
  Set sha256 checksum when archiving traces
  Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace
  Docs guidelines: cherry-picking commits from CE to EE
  CI charts now include the current day
  New .dedicated-no-docs-pull-cache-job and .no-db-job definitions
  Add date calls in .gitlab-ci.yml to see how long each step take
  move misplaced entry point
  Arg.id via method pointer
  Backport description composition from EE
  Fix a typo, a conflict and improve documentation
  Remove extra breadcrumb on tags
  Lazy fetch parent commits for a commit
  Fix Gitaly n+1 in NetworkController#show
  ...

used respond_to formats for persisting flash messages instead

2018-03-06T22:32:26+00:00

Merge branch 'issue_38337' into 'master'

2018-03-06T17:33:31+00:00

Bring one group board to CE

Closes #38337

See merge request gitlab-org/gitlab-ce!17274

Merge branch 'master' into 'issue_38337'

2018-03-06T16:28:54+00:00

# Conflicts:
#   app/models/group.rb
#   db/schema.rb

Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metrics-ce

2018-03-06T15:08:11+00:00

# Conflicts:
#	spec/models/clusters/applications/prometheus_spec.rb