diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-06 17:07:46 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-06 17:07:46 +0000 |
| commit | 6320192592f32519c07231480cbd669a71e78320 (patch) | |
| tree | c760e89a7d5b9acdcd8af7b7c6f18281cc0b2c8f /.mailmap | |
| parent | 7c8c80880995e0bce822a6809fe514ce0f3fda36 (diff) | |
| parent | 01af0aab4a02fca9f47006aae4b4578787c55870 (diff) | |
| download | gitlab-ce-6320192592f32519c07231480cbd669a71e78320.tar.gz | |
Merge branch 'deploy-widget' into 'master'
Only hide deploy status external link on x-small screens.
## What does this MR do?
Fixes [a regression](https://gitlab.com/gitlab-org/gitlab-ce/commit/03ea01946524a74773b24430c81804c2724b84b6#68dead621eaa630b5150a4d71b59fa3cd19030fd_57_50) where the deploy status widget hides only the text within the widget, and only for screens within bootstrap's 'small' range (≥544px - <768px).
## Are there points in the code the reviewer needs to double check?
I changed the viewport width range to hide the widget from `sm` to `xs` because when the external link is removed, it seems to fit comfortably even on xs viewports.
Given that we were already hiding the external link (along with all of the deploy text) on `sm` viewports, I assume it's okay to hide the external link still, instead of wrapping it to a new line.
We could remove the conditional hiding altogether though, and allow the external link to wrap. Definitely doesn't look as nice, but if it's important to show the external link along with the deploy status, we could make it look better when it wraps.
## Why was this MR needed?
Looked buggy, and prevented context being given for build passed icon on smaller screens.
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [ ] Added for this feature/bug
- [x] 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 you do - 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?
https://gitlab.com/gitlab-org/gitlab-ce/issues/22778
cc: @jschatz1
See merge request !6633
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions