diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-30 20:49:57 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-30 20:49:57 +0000 |
commit | 37655a853e7e8c6ee33aeb42f8207e1522ad8326 (patch) | |
tree | 9241f2eef4a4be6269a1ddfaa8e52dff2bf8ce38 /lib/api/notes.rb | |
parent | 7de68c8b7a317fa60ef4d4223399000606d9abbc (diff) | |
parent | 9c6eaf8009ea4cb5a4b33610aad32a2da30f3d09 (diff) | |
download | gitlab-ce-37655a853e7e8c6ee33aeb42f8207e1522ad8326.tar.gz |
Merge branch '24710-fix-generic-commit-status-table-row' into 'master'
Resolve "External statuses not shown correctly on pipeline page"
## What does this MR do?
Updates `generic_commit_status/_generic_commit_status.html.haml` template to match the changes made to `ci/builds/_build.html.haml` which had not previously been carried over.
## Testing
1. Ensure updated fixtures are installed (from !7792) so that these changes are made apparent. (check out the !7792 branch if not yet merged into master, then `bundle exec rake db:drop` and `bundle exec rake dev:setup`)
2. Visit a build list page or an individual pipeline page which contains an external build status.
3. The results should look like this:
### Before:

### After:

## Are there points in the code the reviewer needs to double check?
Look for any places where these partials may be rendered to ensure external status match regular build statuses.
## Why was this MR needed?
The generic commit status template has been largely overlooked when changes are made to build table rows which should be duplicated in both places.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [x] ~~API support added~~
- Tests
- [x] ~~Added for this feature/bug~~
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24710
See merge request !7811
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions