summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-banzai-pre-process' into 'master' Robert Speicher2016-06-211-2/+0
|\ | | | | | | | | | | | | | | | | Move pre_process into render_result This MR moves `Banzai::Renderer.pre_process` into `Banzai::Renderer.render_result`. The `pre_process` method was called even when its output would be ignored. See 11a5a4f359ee57029dbfcc9185fc6b47243ea2aa for more details. See merge request !4830
| * Move pre_process into render_resultremove-banzai-pre-processYorick Peterse2016-06-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | The method Banzai::Renderer.pre_process would always be called, regardless of whether the Markdown to render was already cached or not. In cache the document _was_ cached the output of the pre-processing pipeline was ignored resulting in it doing nothing but wasting CPU cycles. This commit moves Banzai::Renderer.pre_process into Banzai::Renderer.render_result so that it's _only_ used when needed.
* | Merge branch 'backport_from_ee' into 'master' Valery Sizov2016-06-211-1/+1
|\ \ | |/ |/| | | | | | | | | Fix of on-hover state for 'Edit' button on tree view It's already reviewed and merged to EE, so it's just a back-port. See merge request !4823
| * Fix on-hover state for 'Edit' button on tree viewValery Sizov2016-06-211-1/+1
| |
* | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-211-6/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab CI Yaml template dropdown ## What does this MR do? Make it possible to select a dropdown for an easy start with GitLab CI. ## What are the relevant issue numbers? Closes #17521 ## TODO - [ ] Backend - [x] CHANGELOG item - [x] Fix rubocop failure - [x] API Support - [x] New tests - [x] Add disclaimer to the top of the gitlab-ci.yml - [ ] Frontend - [x] New tests See merge request !4411
| * | Incorporate reviewZ.J. van de Weg2016-06-201-2/+2
| | |
| * | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-201-4/+10
| | | | | | | | | | | | | | | | | | | | | This commit builds on the groundwork in ee008e300b1ec0abcc90e6a30816ec0754cea0dd, which refactored the backend so the same code could be used for new dropdowns. In this commit its used for templates for the `.gitlab-ci.yml` files.
| * | Refactor Gitlab::GitignoresZJ van de Weg2016-06-201-5/+3
| | |
* | | Unify check branch name existPaco Guzman2016-06-202-2/+2
|/ /
* | Merge branch 'async-refs-dropdown' into 'master' Jacob Schatz2016-06-201-16/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Correctly adds commit ID into dropdownPhil Hughes2016-06-181-16/+0
| | | | | | | | | | | | | | | Removes un-used method Fixes other Ruby issues
* | | Merge branch 'markdowner' into 'master' Jacob Schatz2016-06-201-0/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Updated design of markdown buttonsPhil Hughes2016-06-171-0/+13
| | |
* | | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-17/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement custom notification level options ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png) ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png) part of #12758 See merge request !4389
| * \ \ Merge master into issue_12758issue_12758Felipe Artur2016-06-178-29/+56
| |\ \ \ | | |/ /
| * | | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-171-16/+8
| |\ \ \
| | * | | Re-use notifications dropdown on user profileFelipe Artur2016-06-161-16/+8
| | | | |
| * | | | Added description to custom option in notification dropdownPhil Hughes2016-06-161-1/+3
| | | | | | | | | | | | | | | | | | | | Always shows the custom option in the dropdown
* | | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-171-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that group owner cannot request access to a project of their group ## What does this MR do? It fixes two things: - 91ad995d69e1a0f8991fd896f1d9febc109273fe Ensure that group owner cannot request access to a project of their group - ec3ff061148d556757e7cd486cdc6083d77acf34 Ensure group/project owners can see their members' access_level (see the commit message for details) ## Are there points in the code the reviewer needs to double check? Not really, these are pretty simple fixes. ## Why was this MR needed? Because there was an issue created! ## What are the relevant issue numbers? Fixes #18717. ## Does this MR meet the acceptance criteria? - [x] CHANGELOG is not needed since the bug is only present in a 8.9 RC - [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 !4729
| * | | | | Address Douwe's feedbackfix-18717Rémy Coutable2016-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make it more explicit that `source` must respond to `#group` and that `#group` must be present. - Indent subsequent lines of a multi-line condition. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Ensure group/project owners can see their members' access_levelRémy Coutable2016-06-171-0/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you are the last owner of a group or the owner of a project, you don't have the :update_<source>_member / :destroy_<source>_member abilities, but you do have the :admin_<source>_member so you should be able to see your members access levels. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-182-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/todos_controller.rb
| * | | | | Checks for current_user when getting todoPhil Hughes2016-06-171-1/+1
| | | | | |
| * | | | | Improved manual todosPhil Hughes2016-06-172-4/+4
| |/ / / / | | | | | | | | | | | | | | | Based on feedback from !4502
* | | | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-171-2/+2
| |_|_|/ |/| | |
* | | | Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-171-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cache todo counters (pending/done) See merge request !4438
| * | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - As todos are created/updated inside the TodoService we repopulate the cache just there for both pending/done todos - Todos as mark as done from the TodosController we update cache there too - All the added methods are kept in the User class for cohesion
* | | | Merge branch 'clipboard-buttons-fix' into 'master' Robert Speicher2016-06-171-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clipboard buttons on "Check out branch" modal. Closes #18794 See merge request !4760
| * | | | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-171-0/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | Also document the clipboard_button_with_class method. Fixes #18794.
* | | | Fixed styling of clipboard buttonclipboard-button-stylingPhil Hughes2016-06-171-1/+1
|/ / /
* | | Merge branch 'template_dropdown' into 'master' Jacob Schatz2016-06-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements TemplateDropdown class to create custom template dropdowns ## What does this MR do? Refactorize template dropdowns. This MR creates a base TemplateSelector class so it can be reused for multiple types of templates. ## 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 - [x] All builds are passing - [ ] 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 !4697
| * | | Implements TemplateDropdown class to create custom template dropdownstemplate_dropdownAlfredo Sumaran2016-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | Also License dropdown has been ported to use our GL dropdown instead of Select2. Fixes tests to make it work with current implementation
* | | | Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' Douwe Maan2016-06-161-6/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix permission checks in member row (backport from gitlab-org/gitlab-ee!460) ## What does this MR do? It improves the check we use to display or not the members' access and controls in the members list. ## Are there points in the code the reviewer needs to double check? No, I replaced an helper with just a permission check so I think it's a better solution. ## Why was this MR needed? There were a spec failure in gitlab-org/gitlab-ee!460 because of the refactor done in the "request access" MR. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - No CHANGELOG needed - [x] Tests - [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 !4670
| * | | Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460Rémy Coutable2016-06-151-6/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' Jacob Schatz2016-06-151-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle whitespace button for compare page ## What does this MR do? Adds whitespace button to compare branches page. ## Are there points in the code the reviewer needs to double check? Ruby code. ## Why was this MR needed? Compare branches UX ## What are the relevant issue numbers? Closes #17881. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.39.48](/uploads/8995a7bc8bea7fa3ff19446ebe49fb88/Screen_Shot_2016-06-09_at_18.39.48.png) ## Does this MR meet the acceptance criteria? - [x] [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) See merge request !4569
| * | | | added whitespace toggle to diffs page and set it to return the project ↵Luke "Jared" Bennett2016-06-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compare path with the selected whitespace params Updated CHANGELOG Moved CHANGELOG entry
* | | | | Merge branch 'issuable-sidebar-bold' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with bold in issuable sidebar ## What does this MR do? ~~The sidebar contained both normal font weight & bold font weight, so this standardises them to bold.~~ After looking at the designs, i've updated the font weights & colors throughout the sidebar to correctly match them ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_11.03.40](/uploads/0a3eb6a67ce5722c77f6adf2fe883017/Screen_Shot_2016-06-02_at_11.03.40.png) See merge request !4398
| * | | | | Corrected all sidebar font weights to correctly match the designPhil Hughes2016-06-101-1/+1
| | | | | |
* | | | | | Merge branch 'commits-ui' into 'master' Jacob Schatz2016-06-153-13/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated commits UI Closes #14633 See merge request !4271
| * | | | | | Improved spacing on mobilePhil Hughes2016-06-081-1/+1
| | | | | | |
| * | | | | | Updated failing testsPhil Hughes2016-06-082-5/+2
| | | | | | |
| * | | | | | Updated testsPhil Hughes2016-06-082-1/+8
| | | | | | |
| * | | | | | Updated some commit UI colorsPhil Hughes2016-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with tree view styles
| * | | | | | Updated commits UIPhil Hughes2016-06-082-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14633
* | | | | | | Merge branch 'pinned-sidebar' into 'master' Jacob Schatz2016-06-151-4/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pinned sidebar navigation option ## What does this MR do? Gives the ability to pin the sidebar navigation. Pinning is only possible on screens with above `lg` which is `1200px` if not it reverts to being hidden by default. ## What are the relevant issue numbers? Closes #18542 ## Screenshots (if relevant) ### Un-pinned ![Screen_Shot_2016-06-15_at_17.29.08](/uploads/82b7495df6ea46a2334a7c25d03b019b/Screen_Shot_2016-06-15_at_17.29.08.png) ### Pinned ![Screen_Shot_2016-06-15_at_17.29.41](/uploads/3eb381be807985d0a9583f000cb802f9/Screen_Shot_2016-06-15_at_17.29.41.png) See merge request !4683
| * | | | | | | Clicking body closes navpinned-sidebarPhil Hughes2016-06-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue when nav wasn't present
| * | | | | | | Pinned sidebar navigation optionPhil Hughes2016-06-151-3/+14
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Closes #18542
* | | | | | | Merge branch 'mr-buttons-update' into 'master' Jacob Schatz2016-06-151-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with MR buttons being in a group ## What does this MR do? Fixes design issue with the buttons in the merge request widget ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_14.13.32](/uploads/44ac4175f5a97a8d7baf97be6eebc684/Screen_Shot_2016-06-09_at_14.13.32.png) See merge request !4562
| * | | | | | Fixed issue with MR buttons being in a groupmr-buttons-updatePhil Hughes2016-06-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed some inline code
* | | | | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-151-1/+1
|\ \ \ \ \ \ \