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

Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)"

2018-03-13T12:01:36+00:00

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

Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'

2018-03-07T18:51:55+00:00

# Conflicts:
#   locale/gitlab.pot

Merge branch 'bvl-allow-maintainer-to-push' into 'master'

2018-03-07T18:43:53+00:00

Allow maintainers to push forks of a project for branches that have open MRs

Closes #22292

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

[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

Backport changes from EE's GithubService integration

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

Adds detailed_status to pipeline hook data
Adds detailed_description option for Services
Integration edit page renders 404 if a service is disabled

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

CE backport for creating CI/CD projects from GitHub

2018-03-07T15:58:50+00:00