summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-08-18 20:24:28 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-08-18 20:24:28 +0000
commit07989af1ef9c86a0c25513a7735133db4fbd5719 (patch)
treec5e6fea4409f33e5e9af256d7842fde66ee3db6b /Gemfile.lock
parent2b487edc98186e7f46c93ef7e6d029902aa82ebe (diff)
parent32060d45a2ceea3dc3e367e6b489cd94967c76c5 (diff)
downloadgitlab-ce-07989af1ef9c86a0c25513a7735133db4fbd5719.tar.gz
Merge branch '13664-abuse-report-page-should-have-a-maximum-width' into 'master'
Abuse Reports message truncation ## What does this MR do? Adds dynamic message truncation to abuse reports ## Are there points in the code the reviewer needs to double check? Is the new UI OK? ## Why was this MR needed? Admin UX ## What are the relevant issue numbers? Closes #13664. ## Screenshots (if relevant) **UPDATED:** ![Screen_Shot_2016-07-07_at_03.02.43](/uploads/2e1a1122e0194f8ffa48054c18523ccd/Screen_Shot_2016-07-07_at_03.02.43.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [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) Closes #13664 See merge request !5032
Diffstat (limited to 'Gemfile.lock')
0 files changed, 0 insertions, 0 deletions