diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 22:19:21 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 22:19:21 +0300 |
commit | 74f8f260982a9b9e1941ad803d53d229cc27c85f (patch) | |
tree | 537195d4740ae123dba20bdb6174ec3fcdb53f79 /spec/lib/gitlab/gitignore_spec.rb | |
parent | 681a3acf97196c1b7c567a5bbd02552a9ecf3115 (diff) | |
parent | 15789e8eb507cef40f7c156c1920821d0ca9c352 (diff) |
Merge branch 'image-border' into 'master'
Add borders to images in issues, MRs, and Help.
## What does this MR do?
Adds a gray border around images in Issues, MRs, and Help pages.
## Are there points in the code the reviewer needs to double check?
That this doesn't effect other elements or pages that it shouldn't.
## Why was this MR needed?
It was hard to differentiate between the actual interface and screenshots of it.
## What are the relevant issue numbers?
Fixes #18578
## Screenshots (if relevant)
### Issues/MRs
Before:
![Screen_Shot_2016-06-14_at_12.22.08_PM](/uploads/00a242a5b4a09b5308f02e6e498862a8/Screen_Shot_2016-06-14_at_12.22.08_PM.png)
After:
![Screen_Shot_2016-06-14_at_12.22.30_PM](/uploads/8fc9fc1c561d788b050e48373449771b/Screen_Shot_2016-06-14_at_12.22.30_PM.png)
![Screen_Shot_2016-06-14_at_12.22.39_PM](/uploads/36c91b2f2ce1eeb77f1646415baea14d/Screen_Shot_2016-06-14_at_12.22.39_PM.png)
### Help
Before:
![Screen_Shot_2016-06-14_at_11.58.54_AM](/uploads/7620491ca338064b872efb538b0bf4f3/Screen_Shot_2016-06-14_at_11.58.54_AM.png)
After:
![Screen_Shot_2016-06-14_at_11.58.57_AM](/uploads/d9fcfcac0f70dde4e69ff4263e369f65/Screen_Shot_2016-06-14_at_11.58.57_AM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [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)
cc: @jschatz1
See merge request !4655
Diffstat (limited to 'spec/lib/gitlab/gitignore_spec.rb')
0 files changed, 0 insertions, 0 deletions