summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Initialize form validation on new group form.group-name-validationBryce Johnson2016-11-021-1/+1
|
* Unchange username_validator.Bryce Johnson2016-11-021-0/+1
|
* Move snake_case to camelCase.Bryce Johnson2016-11-021-2/+2
|
* Change show-gl-field-errors to gl-show-field-errorsBryce Johnson2016-11-0216-19/+19
|
* Fix changelog.Bryce Johnson2016-11-011-45/+1
|
* List gl_field_error as gl_field_errors dep.Bryce Johnson2016-11-011-0/+3
|
* Break out GlFieldError into separate file.Bryce Johnson2016-11-012-166/+165
|
* Add gl field errors to group name edit form.Bryce Johnson2016-11-013-3/+50
|
* Upgrade gl_field_errors to support more use cases.Bryce Johnson2016-11-017-39/+84
|
* Merge branch 'decaffeinate-the-docs' into 'master' Fatih Acet2016-11-016-10/+8
|\ | | | | | | | | | | | | | | | | | | | | Remove leftover references to coffeescript from comments and docs. I was looking at the front-end helper spec and noticed some outdated coffeescript refs in it. So I figured it wouldn't hurt to take a few minutes and remove all the coffeescript references in CE that we don't need anymore. I didn't touch any coffeescript references that could potentially break anything. Just docs and code comments. - [x] All builds are passing See merge request !7151
| * Remove leftover references to coffeescript from comments and docs.decaffeinate-the-docsBryce Johnson2016-10-316-10/+8
| |
* | Merge branch 'issue_23242' into 'master' Sean McGivern2016-11-0110-43/+70
|\ \ | | | | | | | | | | | | | | | | | | Fix project features default values closes #23242 See merge request !7181
| * | Fix project features default valuesFelipe Artur2016-11-0110-43/+70
| | |
* | | Merge branch '23918-reaction-button-style' into 'master' Annabel Dunstone Gray2016-11-013-10/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct padding and alignment for reaction buttons ## What does this MR do? Fixes padding and alignment for reaction buttons on issues. ## Screenshots (if relevant) ### Before ![img](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ae788883aca84799fca9cd23f8e16f28/image.png) ![img](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2f5aa45dbb4899f054f839bd9046bb6/image.png) ### After ![Screen_Shot_2016-10-28_at_3.56.03_PM](/uploads/0b1affed448f6ec24fa56e7800daf753/Screen_Shot_2016-10-28_at_3.56.03_PM.png) ![Screen_Shot_2016-10-28_at_3.56.09_PM](/uploads/311bb59dc6eea8cd124232ebe647b5ef/Screen_Shot_2016-10-28_at_3.56.09_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23918 See merge request !7182
| * | | Correct padding and alignment for reaction buttons23918-reaction-button-styletauriedavis2016-10-313-10/+5
| | | |
* | | | Merge branch 'adam-fix-wiki-links-markdown' into 'master' Sean McGivern2016-11-013-1/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative links in Markdown wiki when displayed in "Project" tab Refers to #23806 See merge request !7218
| * | | | Fix relative links in Markdown wiki when displayed in "Project" tabadam-fix-wiki-links-markdownAdam Niedzielski2016-11-013-1/+47
| | | | | | | | | | | | | | | | | | | | Refers to #23806.
* | | | | Merge branch 'refactor_group_members' into 'master' Sean McGivern2016-11-014-44/+82
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Implement CreateProjectMembers service to make controller thin Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23566 See merge request !7170
| * | | | Implement CreateMembers service to make controller thinrefactor_group_membersValery Sizov2016-11-014-44/+82
| | |/ / | |/| |
* | | | Merge branch 'add-link-to-issue-boards-in-api-readme' into 'master' Achilleas Pipinellis2016-11-011-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a link to the Issue Boards API in main README See merge request !7221
| * | | | Add a link to the Issue Boards API in main READMEAchilleas Pipinellis2016-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'blacklist-osl' into 'master' Robert Speicher2016-11-012-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Blacklist the OSL 3.0 license See merge request !7171
| * | | | | Add OSL to licensing docblacklist-oslSean McGivern2016-10-311-0/+3
| | | | | |
| * | | | | Blacklist the OSL 3.0 licenseSean McGivern2016-10-281-0/+7
| | | | | |
* | | | | | Merge branch 'active-element-tooltip' into 'master' Fatih Acet2016-11-012-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show tooltip for active element ## What does this MR do? Change Bootstrap's default for tooltips to display them only when hovering and not for the active element. See also here: https://getbootstrap.com/javascript/#tooltips-options ## Screenshots ### Before ![before](/uploads/c5b7bd9eba07ca61bfa5ba014d08dd1a/before.webm) ### After ![after](/uploads/d8c4a69e5a6797d8d26ab92cb96fcb2d/after.webm) ## What are the relevant issue numbers? Closes #23794 See merge request !7105
| * | | | | | Do not show tooltip for active element (!7105)winniehell2016-11-012-0/+2
| | | | | | |
* | | | | | | Merge branch 'panjan/gitlab-ce-reference_links_styling' into 'master' Sean McGivern2016-11-0112-75/+174
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Markdown styling inside reference links Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18096. Based off https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6609. See merge request !7169
| * | | | | | | Fix Markdown styling inside reference linkspanjan2016-11-0112-75/+174
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/18096
* | | | | | | Merge branch 'api-projects-fix-mdlink' into 'master' Sean McGivern2016-11-011-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project visibility level link Fix wrong syntax for link generation. See merge request !7201
| * | | | | | | Fix project visibility level linkAndrea Scarpino2016-10-311-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'patch-9' into 'master' Sean McGivern2016-11-011-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Update tags.md See merge request !7202
| * | | | | | Update tags.mdRoman Pickl2016-10-311-1/+1
| | | | | | |
* | | | | | | Merge branch 'optimize/labels-finder' into 'master' Sean McGivern2016-11-0110-28/+41
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize group labels page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23684 Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1148 See merge request !7123
| * | | | | | Update CHANGELOGoptimize/labels-finderDouglas Barbosa Alexandre2016-10-311-0/+4
| | | | | | |
| * | | | | | Assign local_assigns[:subject] to a variable on the shared label partialDouglas Barbosa Alexandre2016-10-311-4/+5
| | | | | | |
| * | | | | | Use select instead of pluck on Project.group_idsDouglas Barbosa Alexandre2016-10-311-1/+1
| | | | | | |
| * | | | | | Skip authorization check when searching for labels on IssuableFinderDouglas Barbosa Alexandre2016-10-312-3/+3
| | | | | | |
| * | | | | | Use label subject to calculate number of issues/mrs within the groupDouglas Barbosa Alexandre2016-10-317-25/+33
| | | | | | |
| * | | | | | Remove unnecessary includes(:priorities) on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-311-1/+1
|/ / / / / /
* | | | | | Merge branch 'mr-copy-filename-btn-update' into 'master' Fatih Acet2016-11-013-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated positioning of copy file path button in diffs ## What does this MR do? Updated the positioning of the copy file path button in diffs. ## Screenshots (if relevant) ![Screen_Shot_2016-10-31_at_16.53.24](/uploads/53de39ce550855f86b90d2d9fc227f95/Screen_Shot_2016-10-31_at_16.53.24.png) ## What are the relevant issue numbers? Closes #23591 See merge request !7203
| * | | | | | Updated positioning of copy file path button in diffsmr-copy-filename-btn-updatePhil Hughes2016-10-313-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23591
* | | | | | | Merge branch 'zj-grape-branches' into 'master' Rémy Coutable2016-11-012-78/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GrapeDSL for branches endpoints No changelog item as it doesn't change behaviour Cherry-picket from !6330 See merge request !6630
| * | | | | | | GrapeDSL for branches endpointszj-grape-branchesZ.J. van de Weg2016-10-312-78/+57
| | | | | | | |
* | | | | | | | Merge branch 'patch-8' into 'master' Fatih Acet2016-10-311-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ES array methods as cause of Phantom.js errors. ## What does this MR do? Adds another example of something that causes a common error in JavaScript testing to the frontend dev docs. See merge request !7102
| * | | | | | | | Add ES array methods as cause of Phantom.js errors.Bryce Johnson2016-10-261-3/+8
| | | | | | | | |
* | | | | | | | | Merge branch '20892-commit-info' into 'master' Fatih Acet2016-10-3112-62/+156
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clean up commit meta info view" Updates commit page design Before: ![Screen_Shot_2016-10-19_at_10.20.10_AM](/uploads/8737a9db01bffc019d8b2c71a943024b/Screen_Shot_2016-10-19_at_10.20.10_AM.png) After: ![Screen_Shot_2016-10-19_at_10.20.01_AM](/uploads/716cb902bd20dedc705a8f81f6536736/Screen_Shot_2016-10-19_at_10.20.01_AM.png) ![Screen_Shot_2016-10-19_at_10.27.01_AM](/uploads/4228575f50990a88bc828037d8fb99f2/Screen_Shot_2016-10-19_at_10.27.01_AM.png) Closes #20892 See merge request !6994
| * | | | | | | | Fix rubocop offenses20892-commit-infoAnnabel Dunstone Gray2016-10-281-2/+2
| | | | | | | | |
| * | | | | | | | Add commit_box specAnnabel Dunstone Gray2016-10-281-0/+28
| | | | | | | | |
| * | | | | | | | Display last pipeline infoAnnabel Dunstone Gray2016-10-282-2/+1
| | | | | | | | |
| * | | | | | | | Fix commits specAnnabel Dunstone Gray2016-10-282-5/+5
| | | | | | | | |