delta/gitlab/gitlab-ce.git/app/models/ci, branch patch-23

Fix merge conflicts on pipeline schedules

2017-06-13T06:23:16+00:00

Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'

2017-06-13T06:23:16+00:00

Resolve "pipeline_schedules pages throwing error 500"

Closes #32790

See merge request !11706
Conflicts:
app/models/ci/pipeline_schedule.rb
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml

Merge branch 'retried-in-database-mysql' into 'master'

2017-05-10T22:12:45+00:00


Retried in database

Closes #25737

See merge request !11115

Add Pipeline Schedules that supersedes experimental Trigger Schedule

2017-05-07T22:35:56+00:00

Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into 'master'

2017-05-06T17:17:02+00:00


Check access to a branch when user triggers manual action

Closes #20261

See merge request !10494

Real time pipeline show action

2017-05-06T16:45:46+00:00

Merge commit '3a2b60f7' from 'master'

2017-05-05T10:22:46+00:00

* commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits)
  Fixed Karma spec
  Reject EE reserved namespace paths in CE as well
  Updated webpack config
  Include the bundler:audit job into the static-analysis job
  Document serializers
  Add artifact file page that uses the blob viewer
  Pipeline table mini graph dropdown remains open when table is refreshed
  Adds off for event hub
  Compile gitlab-shell go executables
  Allow to create new branch and empty WIP merge request from issue page
  Moved to a view spec
  Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md
  Convert seconds to minutes and hours on chat notifations
  Disable navigation to Pages config if Pages is disabled
  Sort the network graph both by commit date and topographically.
  Add tooltips to note action buttons
  Add breadcrumb, build header and pipelines submenu to artifacts browser
  Update todos screenshots
  removes the possibility of commit messages having carriage returns
  Handle incoming emails from aliases correctly
  ...

Add artifact file page that uses the blob viewer

2017-05-04T13:50:12+00:00

Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions

2017-05-02T08:40:10+00:00

* master: (314 commits)
  Better Explore Groups view
  Update Carrierwave and fog-core
  Add specs for Gitlab::RequestProfiler
  Add scripts/static-analysis to run all the static analysers in one go
  Shorten and improve some job names
  Group static-analysis jobs into a single job
  Don't blow up when email has no References header
  Update CHANGELOG.md for 9.1.2
  Add changelog
  Add changelog
  Show Raw button as Download for binary files
  Use blob viewers for snippets
  Fix typo
  Fixed transient failure related to dropdown animations
  Revert "Merge branch 'tc-no-todo-service-select' into 'master'"
  fix link to MR 10416
  Another change from .click -> .trigger('click') to make spec pass
  Change from .click -> .trigger('click') to make spec pass
  Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrations
  Add AddColumnWithDefaultToLargeTable cop
  ...

Conflicts:
	spec/requests/api/jobs_spec.rb

Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master'

2017-04-24T15:18:03+00:00


Properly expire cache for **all** MRs of a pipeline

Closes #31040

See merge request !10770