summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CHANGELOGmerge-request-default-source-branch-textPhil Hughes2016-06-161-13/+1
| | | | [ci skip]
* CHANGELOGPhil Hughes2016-06-161-0/+1
| | | | [ci skip]
* Added source branch text to dropdown togglePhil Hughes2016-06-162-1/+13
| | | | | | Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch"
* Merge branch 'hide-todo-collapsed-sidebar' into 'master' Jacob Schatz2016-06-161-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide the Todo button in the collapsed issuable sidebar. ## What does this MR do? Fixes a bug where the "Add Todo" button was displayed in the collapsed sidebar. ## Are there points in the code the reviewer needs to double check? This shouldn't remove any other elements from the collapsed sidebar. ## What are the relevant issue numbers? None ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-15_at_11.41.46_AM](/uploads/27a1ace58cf8c44ad96accd3d0b32f11/Screen_Shot_2016-06-15_at_11.41.46_AM.png) After: ![Screen_Shot_2016-06-15_at_11.40.53_AM](/uploads/91a8585680fc482682d0efafdba4d599/Screen_Shot_2016-06-15_at_11.40.53_AM.png) See merge request !4686
| * Hide the Todo button in the collapsed issuable sidebar.hide-todo-collapsed-sidebarConnor Shea2016-06-151-0/+5
| |
* | Merge branch 'long-commit-message-scroll-fix' into 'master' Jacob Schatz2016-06-162-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix long commit message scroll issue. Fixes horizontal scrollbar for long commit description. ## Before ![before_](/uploads/d261e26044d8ab451bc7768b16316253/before_.png) ## After ![after](/uploads/f27227a77d25d80b797e3ffc916d1957/after.png) See merge request !4643
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-16353-2724/+15578
| |\ \ | | | | | | | | | | | | long-commit-message-scroll-fix
| * | | Update CHANGELOG.long-commit-message-scroll-fixFatih Acet2016-06-141-0/+1
| | | |
| * | | Fix long commit message scroll issue.Fatih Acet2016-06-141-0/+1
| | | | | | | | | | | | | | | | Fixes #18481.
* | | | Merge branch 'category-search-dropdown' into 'master' Jacob Schatz2016-06-1610-22/+354
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show categorised search queries in the search autocomplete Fixes #5885 It works in 3 categories, Dashboard, Groups and Project. ## Dashboard context ![for-dashboard](/uploads/3a59f6ec008a972495597c8f2691c385/for-dashboard.png) ## Group context ![for-group](/uploads/f7aa413d56330a1d9b2e5562f95badf7/for-group.png) ## Project context ![for-project](/uploads/dabe04cf8758a056cf7b03da001ffd91/for-project.png) ## Screencast ![category-search-dropdown](/uploads/4d9513dcd6ccb6e24adefdf65f9bc778/category-search-dropdown.gif) See merge request !4499
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-16367-2845/+15729
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | category-search-dropdown # Conflicts: # app/assets/javascripts/lib/common_utils.js.coffee
* | | | Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' Jacob Schatz2016-06-153-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compare path with the selected whitespace params Updated CHANGELOG Moved CHANGELOG entry
* | | | | Merge branch 'award-emoji-fix' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emoji block selector. Fixes #18465 and #18577 See merge request !4604
| * | | | | Fix emoji block selector.award-emoji-fixFatih Acet2016-06-111-1/+1
| | | | | |
* | | | | | Merge branch 'update-changelog' into 'master' Robert Speicher2016-06-151-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CHANGELOG [ci skip] See merge request !4695
| * | | | | | Update CHANGELOG for 8.7.7 releaseDouglas Barbosa Alexandre2016-06-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG for 8.6.9 releaseDouglas Barbosa Alexandre2016-06-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip]
| * | | | | | Update CHANGELOG for 8.5.13 releaseDouglas Barbosa Alexandre2016-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG for 8.4.11 releaseDouglas Barbosa Alexandre2016-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG for 8.3.10 releaseDouglas Barbosa Alexandre2016-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG for 8.2.6 release8-2-6-changelog-entriesDouglas Barbosa Alexandre2016-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'revert-b4e8d59b' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '18047-event-item-links-dont-look-like-links' into 'master'" ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) ## 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 - [ ] 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 you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4692
| * | | | | | Revert "Merge branch '18047-event-item-links-dont-look-like-links' into ↵revert-b4e8d59bJacob Schatz2016-06-151-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !4544
* | | | | | Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-159-17/+8262
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace raphael-rails with raphael.js and split it from the rest of the JS ## What does this MR do? Removes raphael.js and its related libraries from the default JS bundle. It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it. This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB. ## Are there points in the code the reviewer needs to double check? That tests pass and that there aren't errors on any pages (especially the Network page). ## Why was this MR needed? It's only used on the Network page and was using way too much bandwidth for just one page. ## What are the relevant issue numbers? #14372 #13165 Follow-up to !4394 and !4516. cc: @jschatz1 See merge request !4519
| * | | | | | Fix failing test.Connor Shea2016-06-101-1/+1
| | | | | | |
| * | | | | | Replace raphael-rails with raphael.js so it can be split from the rest of ↵Connor Shea2016-06-109-17/+8262
| |/ / / / / | | | | | | | | | | | | | | | | | | the JavaScript. The gem isn't maintained anymore anyway. Added a network folder with an application.js including raphael components, since that's the only page using it currently.
* | | | | | Merge branch '18047-event-item-links-dont-look-like-links' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated '.event-item a' color ## What does this MR do? Changes the color of `.event-item` links. ## Are there points in the code the reviewer needs to double check? Did you want this restricted only to the activity page or anywhere showing `.event-item`'s? ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18047. ## Screenshots (if relevant) ![Screen_Shot_2016-06-08_at_20.07.54](/uploads/9670fbeb6fac7a334a83e11ffc05148c/Screen_Shot_2016-06-08_at_20.07.54.png) See merge request !4544
| * | | | | | Updated '.event-item a' colorLuke "Jared" Bennett2016-06-101-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG Removed CHANGELOG entry
* | | | | | Merge branch '18301-top-navigation-needs-hover-state' into 'master' Jacob Schatz2016-06-151-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added hover state to top nav links ## What does this MR do? Adds hover state to top nav links. ## Are there points in the code the reviewer needs to double check? Ney. ## Why was this MR needed? UX. ## What are the relevant issue numbers? Closes #18301. ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_23.23.45](/uploads/dac8ed99eca99fbcccbd98028e947ee1/Screen_Shot_2016-06-07_at_23.23.45.png) See merge request !4521
| * | | | | | added hover state to top nav linksLuke "Jared" Bennett2016-06-101-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG Removed CHANGELOG entry
* | | | | | Merge branch 'milestone-date-clear' into 'master' Jacob Schatz2016-06-154-7/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due date can be removed from milestones ## What does this MR do? Adds a button to milestone form to allow user to remove due date ## What are the relevant issue numbers? Closes #15063 ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_08.32.03](/uploads/8bd4446abde745dd5b1e140a887ec694/Screen_Shot_2016-06-02_at_08.32.03.png) See merge request !4428
| * | | | | | Changed how date gets clearedmilestone-date-clearPhil Hughes2016-06-101-2/+1
| | | | | | |
| * | | | | | Fixed testsPhil Hughes2016-06-101-6/+8
| | | | | | |
| * | | | | | Due date can be removed from milestonesPhil Hughes2016-06-104-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15063
* | | | | | | Merge branch 'add-shortcut-to-copy-file-content-hash-link' into 'master' Jacob Schatz2016-06-154-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add shortcut to copy file content hash link ## What does this MR do? * Allows for multiple shortcut handlers to be initialised * Adds `y` shortcut to file pages to copy permalink URL. ## Are there points in the code the reviewer needs to double check? Ney. ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #14470. ## Screenshots (if relevant) ![y-shortcut](/uploads/b81feb26d8e0d7d4996c4afa29f385d7/y-shortcut.gif) See merge request !4496
| * | | | | | | Added ability to skip the Mousetrap binding resetLuke "Jared" Bennett2016-06-104-2/+14
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added 'y' shortcut for copying a files immutable content hash link Updated CHANGELOG changed ! to not Moved CHANGELOG entry
* | | | | | | Merge branch '17804-pipeline-download-text' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #17804 Pipeline download artifacts text ## What does this MR do? Improves wording to the pipeline artifacts download dropdown items. ## Are there points in the code the reviewer needs to double check? I couldn't test this very easily, any tips? ## Why was this MR needed? UX. ## What are the relevant issue numbers? Closes #17804. ## Screenshots (if relevant) See merge request !4391
| * | | | | | | Pipeline artifacts download button wording improvedLuke "Jared" Bennett2016-06-101-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG Removed CHANGELOG entry
* | | | | | | Merge branch '17929-issue-shortcut-doesnt-work-on-some-pages' into 'master' Jacob Schatz2016-06-152-11/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New issue shortcut doesnt work on some pages ## What does this MR do? 1. Slightly tidies dispatcher switch case by utilising 'fall through' cases. 2. Adds shortcuts to project pipelines, milestones, builds and forks pages ## Are there points in the code the reviewer needs to double check? I have a feeling that these may have been missed out of the case statements on purpose? ## Why was this MR needed? Possible UX issue highlighted in #17929. ## What are the relevant issue numbers? Closes #17929. Closes #12616. (dup) Closes #18123. (dup) Closes #13688. (dup) ## Screenshots (if relevant) See merge request !4393
| * | | | | | | Tidied dispatcher switch and added shortcuts to project pipelines, ↵Luke "Jared" Bennett2016-06-102-11/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | milestones and forks pages Updated CHANGELOG Moved CHANGELOG entry
* | | | | | | Merge branch 'issuable-sidebar-bold' into 'master' Jacob Schatz2016-06-158-31/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Checks against date parsing instead of stringissuable-sidebar-boldPhil Hughes2016-06-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes template for html string that isn't needed
| * | | | | | | Fixed testsPhil Hughes2016-06-101-2/+2
| | | | | | | |
| * | | | | | | Uses already defined color for text in sidebarPhil Hughes2016-06-101-2/+2
| | | | | | | |
| * | | | | | | Updated link colorPhil Hughes2016-06-101-1/+1
| | | | | | | |
| * | | | | | | Corrected all sidebar font weights to correctly match the designPhil Hughes2016-06-107-30/+28
| | | | | | | |
| * | | | | | | Fixed issue with bold in issuable sidebarPhil Hughes2016-06-103-6/+7
| | | | | | | |
* | | | | | | | Merge branch '18434-emoji-icon-styling' into 'master' Jacob Schatz2016-06-151-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed notes action buttons on mobile ## What does this MR do? Fixes the mobile screen size styling for notes action buttons. It ensures there is space between icons and forces parts of the notes header to stack ## Are there points in the code the reviewer needs to double check? Stacking? ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18434. ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_17.52.09](/uploads/18849fdfc4fcbf7b67fc66633bbac129/Screen_Shot_2016-06-13_at_17.52.09.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) See merge request !4631
| * | | | | | | | Fixed notes action buttonsLuke "Jared" Bennett2016-06-131-1/+11
| | | | | | | | |