Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

3b93d37e

Commit 3b93d37e authored 9 years ago by Kamil Trzciński

Downloads
- Plain Diff

Merge branch 'fix-retry-and-cancel' into 'master'

Fix retry and cancel for build

This fixes some regressions introduced by Commit Status API

See merge request !1586

parents 07101cfa 33c9d6e4

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/models/ci/build.rb 2 additions, 2 deletions

app/models/ci/build.rb
app/views/projects/commit/ci.html.haml 13 additions, 9 deletions

app/views/projects/commit/ci.html.haml
app/views/projects/commit_statuses/_commit_status.html.haml 3 additions, 3 deletions

app/views/projects/commit_statuses/_commit_status.html.haml
spec/features/commits_spec.rb 9 additions, 1 deletion

spec/features/commits_spec.rb

with 27 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment