summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update default regexp documentation to match 8172d2c1.update-regexp-docStan Hu2016-06-221-1/+1
| | | | [ci skip]
* Merge branch 'image-border' into 'master' Jacob Schatz2016-06-204-0/+22
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Emoji shouldn't have borders. #EmojiWithoutBordersConnor Shea2016-06-193-3/+3
| |
| * Add borders to images in issues, MRs, and Help.Connor Shea2016-06-194-0/+22
| |
* | Merge branch 'note-emoji-system-note' into 'master' Jacob Schatz2016-06-201-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides award emoji & access level on system notes ## What does this MR do? Hides award emoji & access level on system notes as they aren't applicable to them notes. ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png) See merge request !4629
| * | Uses not when checking for system notenote-emoji-system-notePhil Hughes2016-06-171-2/+2
| | |
| * | Hides award emoji & access level on system notesPhil Hughes2016-06-131-2/+2
| | |
* | | Merge branch 'async-refs-dropdown' into 'master' Jacob Schatz2016-06-2015-86/+133
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refs dropdown is now loaded async ## What does this MR do? The refs dropdown is loaded async so not to block the page. ## What are the relevant issue numbers? Part of #18202 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png) See merge request !4508
| * | | Fixed issue with returning ref in commits JSONasync-refs-dropdownPhil Hughes2016-06-203-4/+24
| | | | | | | | | | | | | | | | Added tests to project controller
| * | | Fixed Ruby to use excludePhil Hughes2016-06-182-2/+2
| | | |
| * | | Correctly adds commit ID into dropdownPhil Hughes2016-06-185-70/+10
| | | | | | | | | | | | | | | | | | | | Removes un-used method Fixes other Ruby issues
| * | | Pulls back tags if any existPhil Hughes2016-06-181-2/+6
| | | |
| * | | Escapes branch names before appending to domPhil Hughes2016-06-182-2/+2
| | | |
| * | | Tests fix for ref switcherPhil Hughes2016-06-187-16/+37
| | | |
| * | | Refs dropdown is now loaded asyncPhil Hughes2016-06-187-11/+73
| | | |
* | | | Merge branch '18584-document-request-access-feature' into 'master' Achilleas Pipinellis2016-06-2017-1/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document access request to project & group ## What does this MR do? Adds documentation that was missing from !3798. ## Are there points in the code the reviewer needs to double check? I've taken the opportunity to update the images in the "Project users" documentation page, I can remove the commit if it's not welcome! ## What are the relevant issue numbers? Closes #18584. ## Does this MR meet the acceptance criteria? - [ ] Tests - [ ] 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) /cc @DouweM See merge request !4685
| * | | | Update images for the 'Project users' documentation18584-document-request-access-featureRémy Coutable2016-06-1510-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Add documentation for the 'request access to group' featureRémy Coutable2016-06-154-0/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Add documentation for the 'request access to project' featureRémy Coutable2016-06-154-0/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '18757-fix' into 'master' Stan Hu2016-06-202-14/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fallback to group's owners/masters when a project has none for the "access requested email" ## What does this MR do? From b31c5052f9acf5d9118b2b81b556199279e7ca30: Fallback to group's owners/masters when a project has none A project in a group can have no explicit owners/masters, in that case we fallbacks to the group's owners/masters. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because of #18757. ## What are the relevant issue numbers? Fixes #18757. ## Does this MR meet the acceptance criteria? - [x] No need for CHANGELOG. - [x] No need for documentation. - [x] No API support added. - [x] Tests - [x] Added for this feature/bug - [x] 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) See merge request !4791
| * | | | | Fallback to group's owners/masters when a project has none18757-fixRémy Coutable2016-06-202-14/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A project in a group can have no explicit owners/masters, in that case we fallbacks to the group's owners/masters. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'markdowner' into 'master' Jacob Schatz2016-06-209-11/+148
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Markdown shortcut buttons ## What does this MR do? Adds markdown shortcut buttons to text area for comments. ## Are there points in the code the reviewer needs to double check? Because changing `textarea.val('something')` kills the natural browser undo stack, I had to implement a custom undo stack using state. You can't use the "undoable" state undo pattern because you need to go back to a previous state regardless of cursor position. The undo also adds an undo history item once you delete stuff or press enter. You can also edit multiple textareas at once and it will keep an undo history for each textarea individually, so the undo state should not collide between textareas. ## Why was this MR needed? It has been requested multiple times and the competition has it. https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433 Libraries are available that already implement this functionality but they are enormous and bloaty. I implemented this in very few lines of code and kept it very simple and as minimal as possible. This was also some competitions approach. I believe so as to not include too much JS. Adding extra buttons with new functionality **should only need new HTML and no new JS**. Only extra complex thing was adding a overridden undo stack, which was made as simple as possible as well. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433 ## Screenshots (if relevant) **NOTE:** One thing you cannot see in this screenshot is that I am pressing <kbd>Cmd</kbd><kbd>Z</kbd> to undo and <kbd>Cmd</kbd><kbd>Shift</kbd><kbd>Z</kbd> to redo which is the undo/redo stack I implemented. <kbd>Ctrl</kbd><kbd>Y</kbd> also works for redo. ![markdown-editor](/uploads/2517bfb1a7b4269da7fcc4003c88b7f6/markdown-editor.gif) cc @dzaporozhets for UI cc @iamphill @alfredo1 for JS review cc @JobV if you like the idea. Fixes: #17185 See merge request !4305
| * | | | | | Added text_utility to JS testsmarkdownerPhil Hughes2016-06-201-6/+7
| | | | | | |
| * | | | | | Made markdown buttons work on all markdown textareasPhil Hughes2016-06-174-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Selecting multiple rows & a list correctly creates the selected text into a list
| * | | | | | Improved designPhil Hughes2016-06-171-105/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated JS to remove undo manager - instead let the browser handle it all
| * | | | | | Updated design of markdown buttonsPhil Hughes2016-06-173-24/+48
| | | | | | |
| * | | | | | Make tests pass.Jacob Schatz2016-06-171-1/+1
| | | | | | |
| * | | | | | Fix spec issueJacob Schatz2016-06-171-1/+1
| | | | | | |
| * | | | | | Move buttons to upper right.Jacob Schatz2016-06-174-13/+30
| | | | | | |
| * | | | | | Revert _form fileJacob Schatz2016-06-171-2/+3
| | | | | | |
| * | | | | | Fix syntax error. Remove whitespaceJacob Schatz2016-06-171-2/+2
| | | | | | |
| * | | | | | Proper class jquery selector for `off`.Jacob Schatz2016-06-171-1/+1
| | | | | | |
| * | | | | | No need to add bold for the class selector for removing eventsJacob Schatz2016-06-171-1/+1
| | | | | | |
| * | | | | | Remove console.logJacob Schatz2016-06-171-4/+5
| | | | | | |
| * | | | | | Add undo history once they click the enter or backspace keyJacob Schatz2016-06-171-1/+12
| | | | | | |
| * | | | | | Add redo stateJacob Schatz2016-06-171-0/+3
| | | | | | |
| * | | | | | Overwrite undo historyJacob Schatz2016-06-173-5/+51
| | | | | | |
| * | | | | | Initial markdown ez buttonsJacob Schatz2016-06-171-2/+1
| | | | | | |
| * | | | | | Initial markdown ez buttonsJacob Schatz2016-06-174-0/+93
| | | | | | |
* | | | | | | Merge branch '17949-error-500-on-gitlab-org-when-visiting-pipelines' into ↵Rémy Coutable2016-06-201-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Set missing stages on ci builds to 'test' to avoid regressions in the pipelines view ## What does this MR do? Sets a default stage on old `ci_builds`. ## Are there points in the code the reviewer needs to double check? Is the migration acceptable for online execution? ## Why was this MR needed? Old `ci_builds`with no stages cause a regression on the pipelines index view. ## What are the relevant issue numbers? #17949 Blocked by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4680 See merge request !4381
| * | | | | | | Set missing stages on ci builds to 'test' to avoid regressions in the ↵17949-error-500-on-gitlab-org-when-visiting-pipelinesAlejandro Rodríguez2016-06-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pipelines view
* | | | | | | | Merge branch 'patch-1' into 'master' Stan Hu2016-06-201-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken instructions. git fetch --all --tags doesn't refresh tags See merge request !4092
| * | | | | | | | Broken instructions. git fetch --all --tags doesn't refresh tagsfliespl2016-05-091-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'issue_12758_2' into 'master' Yorick Peterse2016-06-201-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notification_settings:events to schema See merge request !4800
| * | | | | | | | | Add notification_settings:events to schemaissue_12758_2Felipe Artur2016-06-201-1/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mr-button-placement' into 'master' Jacob Schatz2016-06-202-2/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed placement of close button on merge requests ## What does this MR do? Fixes the order in which the MR buttons appear ## Screenshots (if relevant) ![Screen_Shot_2016-06-18_at_21.41.38](/uploads/66a88ebc287b7c21160af193ee9de54c/Screen_Shot_2016-06-18_at_21.41.38.png) ![Screen_Shot_2016-06-18_at_21.41.44](/uploads/ba8f6776d79f4eb0af7877c3c71fbb54/Screen_Shot_2016-06-18_at_21.41.44.png) See merge request !4778
| * | | | | | | | | Fixed mobile stylingmr-button-placementPhil Hughes2016-06-201-0/+13
| | | | | | | | | |
| * | | | | | | | | Fixed placement of close button on merge requestsPhil Hughes2016-06-181-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-double-query-string-url' into 'master' Robert Speicher2016-06-202-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double query string in url This MR should fix the double query string in url that shows up while using the "filter by name .." input on projects list pages and also closes [17743](https://gitlab.com/gitlab-org/gitlab-ce/issues/17743) Closes #17743 See merge request !4480
| * | | | | | | | using request dot path insteadbarthc2016-06-172-2/+2
| | | | | | | | |