summaryrefslogtreecommitdiff
path: root/app/views/shared
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-inconsistent-font-weight-sidebar-label' into 'master' Fatih Acet2016-09-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inconsistent font weight for sidebar's labels ## What does this MR do? Removes the `.bold` css class from the sidebar label default value so that it is no longer bold :smile: **None** => None ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Fixes a UI inconsistency ## What are the relevant issue numbers? Closes #21141 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-24_at_9.41.11_AM](/uploads/3e416d45531b7322474922c569225c03/Screen_Shot_2016-08-24_at_9.41.11_AM.png) After: ![Screen_Shot_2016-08-24_at_9.40.57_AM](/uploads/a4d60d4cd0a57142ad6c0c8a25be5342/Screen_Shot_2016-08-24_at_9.40.57_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - 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 !5984
| * Remove inconsistent font weight for sidebar's labelsClement Ho2016-09-011-1/+1
| |
* | Replace play icon font with svgClement Ho2016-09-011-1/+3
|/
* Fixed escaping issue with labels filterlabel-dropdown-encodePhil Hughes2016-08-311-1/+1
| | | | Closes #15552
* Merge branch 'issue-boards-search' into 'master' Fatih Acet2016-08-301-9/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added search for all lists on issue boards ## What does this MR do? Adds a search box to allow the user to search all lists in issue boards rather than just the backlog. ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_10.33.15](/uploads/67e96055d60a9b3209ce3831a1980c09/Screen_Shot_2016-08-30_at_10.33.15.png) ![Screen_Shot_2016-08-30_at_10.33.19](/uploads/8d5253b8f2ecf1cf9a69d70be8ccf1f9/Screen_Shot_2016-08-30_at_10.33.19.png) ## What are the relevant issue numbers? Closes #21139 See merge request !6101
| * Added search for all lists on issue boardsPhil Hughes2016-08-301-9/+12
| | | | | | | | Closes #21139
* | Resize created iconcreated-icon-fixAnnabel Dunstone2016-08-301-1/+1
| |
* | Merge branch '21520-created-pipeline' into 'master' Fatih Acet2016-08-301-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new icon for created pipeline ## What does this MR do? Adds new icon for `created` status ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_11.55.02_AM](/uploads/e062f9eb3b8102374fb92ce209ab69b1/Screen_Shot_2016-08-30_at_11.55.02_AM.png) ## What are the relevant issue numbers? Closes #21520 See merge request !6108
| * | Add new icon for created pipelineAnnabel Dunstone2016-08-301-0/+1
| |/
* | Improve grammarKatarzyna Kobierska2016-08-301-1/+1
| |
* | Improve codeKatarzyna Kobierska2016-08-301-21/+20
| |
* | User can edit closed MR with deleted forkKatarzyna Kobierska2016-08-301-20/+21
|/ | | | | | | | | | | | | | | | | | | | | | Add test for closed MR without fork Add view test visibility of Reopen and Close buttons Fix controller tests and validation method Fix missing space Remove unused variables from test closed_without_fork? method refactoring Add information about missing fork When closed MR without fork can't edit target branch Tests for closed MR edit view Fix indentation and rebase, refactoring
* Change logo animation to CSSClement Ho2016-08-261-8/+8
|
* Add horizontal scrolling to all sub-navs on mobile viewportsClement Ho2016-08-251-0/+4
|
* Merge branch 'rs-description-templates-tabindex' into 'master' Robert Speicher2016-08-231-1/+1
|\ | | | | | | | | Remove tab stop from issuable form added by description templates See merge request !5929
| * Remove tab stop from issuable form added by description templatesrs-description-templates-tabindexRobert Speicher2016-08-211-1/+1
| |
* | Merge branch 'revert_revert_issuable_lock' into 'master' Douwe Maan2016-08-231-0/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the revert of Optimistic Locking ## What does this MR do? It reverts the revert of optimistic lock https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5146 (and revert MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5245) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19871 Actually the code is already reviewed, except: * Monkey patch `config/initializers/ar_monkey_patch.rb` * We removed default values from migration `db/migrate/20160707104333_add_lock_to_issuables.rb` See merge request !5623
| * | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-0/+9
| |/
* | Remove link to docs from new list textissue-boards-docAchilleas Pipinellis2016-08-221-3/+0
| |
* | Change images to reflect current status, add link to inline docsAchilleas Pipinellis2016-08-221-1/+7
|/
* Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-191-4/+16
|\ | | | | | | | | | | | | Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
| * Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-191-0/+1
| |\ | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-181-2/+3
| |\ \
| * | | Allow project group links to be expiredSean McGivern2016-08-181-1/+1
| | | |
| * | | Add expiration date to group membershipsSean McGivern2016-08-181-7/+6
| | | |
| * | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-188-22/+64
| |\ \ \
| * | | | Add MemberExpirationDate JS helperSean McGivern2016-08-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper adds a datepicker to all `js-access-expiration-date` elements. If that element is a child of a `clearable-input` element and has a sibling `js-clear-input` element, then it will show a working clear button to the right of the input field.
| * | | | Add MemberExpirationDate JS helperSean McGivern2016-08-181-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper adds a datepicker to all `js-access-expiration-date` elements. If that element is a child of a `clearable-input` element and has a sibling `js-clear-input` element, then it will show a working clear button to the right of the input field.
| * | | | Use "is_a?" because it is more readable than checking the "type" field.Adam Niedzielski2016-08-091-1/+1
| | | | |
| * | | | Single quotes all the way.Adam Niedzielski2016-08-071-1/+1
| | | | |
| * | | | Remove inline JavaScript. Add datepicker to the edit form.Adam Niedzielski2016-08-061-2/+3
| | | | |
| * | | | Allow to edit access expiration date.Adam Niedzielski2016-08-051-1/+3
| | | | |
| * | | | Better presentation of member expiration.Adam Niedzielski2016-08-051-2/+3
| | | | |
| * | | | Add Member#expires? method.Adam Niedzielski2016-08-041-1/+1
| | | | |
| * | | | Display expiration date in the project member list.Adam Niedzielski2016-08-031-0/+3
| | | | |
* | | | | Merge branch 'ace-ventura' into 'master' Jacob Schatz2016-08-191-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ace ventura ## What does this MR do? Makes Ace only load when it's actually necessary. The only two places it seems to be used is for Snippets and the File (Blob) Editor. Before minification or compression, this takes the application.js down from 2.2MB to 1.6MB, and also removes two inline scripts :D Compressed/Minified: master: 317KB/1.1MB, ace-ventura: 220KB/771KB ## Are there points in the code the reviewer needs to double check? That this doesn't just completely break anything. ## Why was this MR needed? Ace is a big library, this allows us to only load it when necessary. ## What are the relevant issue numbers? #14372 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - 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 !4914
| * | | | | Only load Ace on Snippets and file edit pages.Connor Shea2016-08-181-5/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'label-tooltip-sidebar-collapsed' into 'master' Robert Speicher2016-08-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tooltip to label value in collapsed sidebar ## What does this MR do? Adds a list of the issuables labels to a tooltip in the collapsed sidebar. Limited to 5 otherwise the list could get crazy long. Closes #19398 See merge request !5232
| * | | | | Changed tests to use JS testsPhil Hughes2016-08-191-1/+1
| | | | | |
| * | | | | Addressed feedbackPhil Hughes2016-08-191-1/+1
| | | | | |
| * | | | | Added tooltip to label value in collapsed sidebarPhil Hughes2016-08-191-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Closes #19398
* | | | | Merge branch 'pipelines-ui-updates' into 'master' Jacob Schatz2016-08-191-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines ui updates #### What does this MR do? * Fixes hover color width on build list * Fixes alignment of status icon on commits page * Add play icon SVG #### Why was this MR needed? Small UI bugs with recent MRs ![Screen_Shot_2016-08-17_at_5.54.32_PM](/uploads/a5f1a38eac332865b17d8d74eeaa5142/Screen_Shot_2016-08-17_at_5.54.32_PM.png) ![Screen_Shot_2016-08-17_at_5.56.43_PM](/uploads/90608eee3e83dbe14244ff2be5a8867e/Screen_Shot_2016-08-17_at_5.56.43_PM.png) ![Screen_Shot_2016-08-18_at_9.18.37_AM](/uploads/9c1265fc3efa7b6084e2368d3fe458cd/Screen_Shot_2016-08-18_at_9.18.37_AM.png) See merge request !5856
| * | | | | Add play icon SVGAnnabel Dunstone2016-08-191-0/+1
| |/ / / /
* | | | | Merge branch '17932-move-to-project-dropdown' into 'master' Jacob Schatz2016-08-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move to project dropdown with infinite scroll for better performance ## What does this MR do? On the Move dropdown on the edit issue page we introduced infinite scrolling to just return a limited number of projects, 50 items. So if the user can move the issue to 50 or more items when scroll down on the list a new set of projects will be requested to the server. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? See #17932 ## What are the relevant issue numbers? Closes #17932 ## Screenshots (if relevant) ## 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 - [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 !5686
| * | | | | Move to project dropdown with infinite scroll for better performance17932-move-to-project-dropdownPaco Guzman2016-08-181-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use just SQL to check is a user can admin_issue on a project Using offset pagination instead pages to avoid a count query Tradeoff - we duplicate how we check admin_issue in a SQL relation in the Ability class
* | | | | Merge branch 'cs-async-branch-dropdown' into 'master' Jacob Schatz2016-08-191-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load branch dropdowns asynchronously for cherry pick and revert dialogs ## Why was this MR needed and what does it do? Previously every commit page was loading every branch onto the page twice, once each for the Cherry Pick and Revert modal dialogs. Most of the time they're never used, so that's a bit of a waste. This loads them asynchronously by modifying the existing ref switcher code to also work for the branch selectors. This is better for performance. ## Are there points in the code the reviewer needs to double check? Make sure Cherry Picking and Reverting still work (from my tests they seem to be fine). ## What are the relevant issue numbers? Fixes #20108. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-01_at_4.35.21_PM](/uploads/6b76ea656fd00df52ab56df5309976dc/Screen_Shot_2016-08-01_at_4.35.21_PM.png) ![Screen_Shot_2016-08-01_at_4.35.52_PM](/uploads/d2699a4bfc4ad1a4d414429e7c50e60f/Screen_Shot_2016-08-01_at_4.35.52_PM.png) After: ![Screen_Shot_2016-08-01_at_4.32.49_PM](/uploads/5faa6494b10dd9ac5e8850763a0c4018/Screen_Shot_2016-08-01_at_4.32.49_PM.png) ![Screen_Shot_2016-08-01_at_4.32.56_PM](/uploads/87c490bb375244e7d72421fd55e13e3f/Screen_Shot_2016-08-01_at_4.32.56_PM.png) ![Screen_Shot_2016-08-01_at_4.33.02_PM](/uploads/59ae65c0afc39d8939a9f36431815854/Screen_Shot_2016-08-01_at_4.33.02_PM.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 - [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) cc: @iamphill @jschatz1 See merge request !5607
| * | | | Make the ref-selector function work properly for branch selection.Connor Shea2016-08-171-1/+1
| | | | |
* | | | | Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-191-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff line comments resolve ## What does this MR do? Diff line comments can be resolved. Part of #10325 To do: - [x] Backend (@DouweM) - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331 - [x] System note when all discussions are resolved - [x] Notification when all discussions are resolved - [x] Write unit tests - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9 - [x] Frontend (@iamphill) - [x] Fix bugs - [x] Write more feature tests - [x] Frontend (@connorshea) - [x] Address frontend feedback - [x] Feature specs for Jump feature - [x] Documentation - [x] Add Vue.js in a standard way See merge request !5022
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-184-7/+7
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-172-2/+17
| |\ \ \ \