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

28709a4d

Commit 28709a4d authored 7 years ago by Phil Hughes

Downloads
- Plain Diff

Merge branch '34075-pipelines-count-mt' into 'master'

Update Pipeline's badge count in Merge Request and Commits view to match real-time content

Closes #34075

See merge request !12789

parents 0618ad12 706d99ae

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/commit/pipelines/pipelines_bundle.js 21 additions, 8 deletions

app/assets/javascripts/commit/pipelines/pipelines_bundle.js
app/assets/javascripts/commit/pipelines/pipelines_table.vue 11 additions, 0 deletions

app/assets/javascripts/commit/pipelines/pipelines_table.vue
app/controllers/projects/commit_controller.rb 8 additions, 3 deletions

app/controllers/projects/commit_controller.rb
app/controllers/projects/merge_requests_controller.rb 8 additions, 3 deletions

app/controllers/projects/merge_requests_controller.rb
app/views/projects/commit/_ci_menu.html.haml 1 addition, 1 deletion

app/views/projects/commit/_ci_menu.html.haml
app/views/projects/merge_requests/show.html.haml 1 addition, 1 deletion

app/views/projects/merge_requests/show.html.haml
changelogs/unreleased/34075-pipelines-count-mt.yml 5 additions, 0 deletions

changelogs/unreleased/34075-pipelines-count-mt.yml
spec/controllers/projects/commit_controller_spec.rb 2 additions, 1 deletion

spec/controllers/projects/commit_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb 2 additions, 1 deletion

spec/controllers/projects/merge_requests_controller_spec.rb
spec/javascripts/commit/pipelines/pipelines_spec.js 35 additions, 0 deletions

spec/javascripts/commit/pipelines/pipelines_spec.js

with 94 additions and 18 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