summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add visibility icon4424-improve-ui-admin-areaAlfredo Sumaran2016-07-141-0/+3
|
* Remove previously introduced CSS that will not be used anymoreAlfredo Sumaran2016-07-141-23/+0
|
* Make admin/groups view consistent with dashboard/groupsAlfredo Sumaran2016-07-141-17/+20
|
* Fix New Group button spacing on mobileAlfredo Sumaran2016-07-141-1/+1
|
* Make CSS consistent againAlfredo Sumaran2016-07-143-11/+5
|
* Rename .group-controls to .controlsAlfredo Sumaran2016-07-142-3/+3
|
* Remove unnecesary CSS classAlfredo Sumaran2016-07-142-2/+2
|
* Merge branch 'pipeline-row-improvements' into 'master' Fatih Acet2016-07-142-6/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline row improvements ## What does this MR do? Makes minor pipeline row improvements: * Add margin between labels * Remove underline hover style on status button * Add margin between buttons if both retry and cancel are present ## What are the relevant issue numbers? Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-14_at_12.31.54_PM](/uploads/ae88651cb240ea90a0be58ab0ed65805/Screen_Shot_2016-07-14_at_12.31.54_PM.png) See merge request !5258
| * Add margin between buttons if both retry and cancel are presentAnnabel Dunstone2016-07-142-6/+13
| |
| * Add margin between labels; remove underline hover style on status buttonAnnabel Dunstone2016-07-141-0/+12
|/
* Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-146-8/+40
|\ | | | | | | | | | | | | | | | | | | | | Fix import_data being saved as a result of an invalid import_url Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19479 Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. <= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 See merge request !5206
| * udpated JS based on feedbackfix/persistent-import-dataJames Lopez2016-07-141-5/+2
| |
| * some JS magic to fix empty URL bugJames Lopez2016-07-132-2/+10
| |
| * updated create_or_update_import_data to use guard clauseJames Lopez2016-07-131-1/+3
| |
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-07-13170-1034/+1734
| |\ | | | | | | | | | fix/persistent-import-data
| * | fix more specsJames Lopez2016-07-131-1/+5
| | |
| * | Merge remote-tracking branch 'gitlab/fix/persistent-import-data' into ↵James Lopez2016-07-131-1/+1
| |\ \ | | | | | | | | | | | | fix/persistent-import-data
| | * | Update CHANGELOGJames Lopez2016-07-121-1/+1
| | | |
| * | | fix specsJames Lopez2016-07-131-1/+1
| |/ /
| * | added changelogJames Lopez2016-07-121-0/+3
| | |
| * | fixes a few issues to do with import_url not being saved correctly for ↵James Lopez2016-07-123-5/+23
| | | | | | | | | | | | imports. This should prevent the import_data to be created when it should not and output an error properly validating before creating it.
* | | Merge branch 'cleanup-feature-proposal' into 'master' Job van der Voort2016-07-141-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup feature proposal template ## What does this MR do? Changes the recommended template for feature proposals. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? I've been using the template for a while, and find that putting so many words into the h2 makes me think there's actual content there, until I realize I'm just reading the template text (again). I think we can get away with just putting `Description` as the header, and putting the suggested content for that section as plain text below for someone to replace. ## What are the relevant issue numbers? ## Screenshots (if relevant) ![image](/uploads/20a99c98a12aad84c1a7ec020f365b2f/image.png) /cc @JobV See merge request !5240
| * | | Cleanup feature proposal templatecleanup-feature-proposalMark Pundsack2016-07-131-1/+2
| | | |
* | | | Merge branch 'project-files-header-cursor' into 'master' Fatih Acet2016-07-142-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use default cursor for table header of project files ## What does this MR do? Use default cursor for table header of project files. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? The table header had a pointer cursor even though it was not clickable. ## What are the relevant issue numbers? fixes #19612 See merge request !5165
| * | | | Use default cursor for table header of project files (!5165)winniehell2016-07-142-2/+2
| | | | |
* | | | | Merge branch 'lbennett/gitlab-ce-18120-focus-filter-shortcut' into 'master' Fatih Acet2016-07-145-12/+21
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added shortcut to focus filters ## What does this MR do? Adds shortcut `f` to focus filter inputs. ## Are there points in the code the reviewer needs to double check? Is this a valid implementation? Please check [this comment below](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4570#note_12359978)! ## Why was this MR needed? Keyboard ninja UX :crossed_swords: ## What are the relevant issue numbers? Closes #18120. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.34.56](/uploads/d4cfb6ec340c118f5227be3f16ffbed1/Screen_Shot_2016-06-09_at_18.34.56.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 !4763
| * | | | Review changeslbennett/gitlab-ce-18120-focus-filter-shortcutLuke "Jared" Bennett2016-07-112-8/+9
| | | | |
| * | | | Added shortcut to focus all search tags apart from the top nav searchLuke "Jared" Bennett2016-07-115-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG Added docs for filter shortcut Moved CHANGELOG entry Added phils fixes Fixed search form submitting with empty input Added review fixes Readability and selector perf fix
* | | | | Merge branch 'top-links-label' into 'master' Fatih Acet2016-07-142-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aria labels on top header links ## What does this MR do? Added `aria-label` to the links in top header bar for accessibility. ## What are the relevant issue numbers? Closes #12797 See merge request !5205
| * | | | | Aria labels on top header linkstop-links-labelPhil Hughes2016-07-122-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Closes #12797
* | | | | | Merge branch 'issuable-author-tooltip' into 'master' Fatih Acet2016-07-142-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added author username tooltip in issuable header ## What does this MR do? Adds the authors username as a tooltip to the header of issuables ## What are the relevant issue numbers? Closes #13771 ## Screenshots (if relevant) ![Screen_Shot_2016-07-12_at_16.00.34](/uploads/9485150f1c9d4006384f18d08a07430f/Screen_Shot_2016-07-12_at_16.00.34.png) See merge request !5209
| * | | | | | Fixed Rubocopissuable-author-tooltipPhil Hughes2016-07-131-2/+1
| | | | | | |
| * | | | | | Added author username tooltip in issuable headerPhil Hughes2016-07-122-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13771
* | | | | | | Merge branch 'dz-nicer-sidebar' into 'master' Dmitriy Zaporozhets2016-07-143-7/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves left static sidebar behaviour List of changes: * removed bottom 50px space that is no longer necessary with pin button at the top * increased side padding so sidebar links are closer to counters * use fixed weight pin icon so it correctly aligned with counters cc @annabeldunstone @jschatz1 See merge request !5251
| * | | | | | | Improves left static sidebar behaviourDmitriy Zaporozhets2016-07-143-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List of changes: * removed bottom 50px space that is no longer necessary with pin button at the top * increased side padding so sidebar links are closer to counters * use fixed weight pin icon so it correctly aligned with counters Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'fix-duplicate-changelog-entry' into 'master' Robert Schilling2016-07-141-3/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicated entry in changelog [ci skip] ## What does this MR do? Removes duplicate changelog entries. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19822 See merge request !5252
| * | | | | | | Fix duplicated entry in changelog [ci skip]Robert Schilling2016-07-141-3/+0
|/ / / / / / /
* | | | | | | Merge branch 'rs-delimit-in-ui-guide' into 'master' Dmitriy Zaporozhets2016-07-141-21/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a UI guide note about number_with_delimiter See merge request !5220
| * | | | | | | Add a UI guide note about number_with_delimiterrs-delimit-in-ui-guideRobert Speicher2016-07-121-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'mrchrisw/oauth-callback' into 'master' Achilleas Pipinellis2016-07-141-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include default callback URL (OAuth) ## What does this MR do? Adds information on the OAuth callback URL ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? This information was missing. ## What are the relevant issue numbers? http://www.twitter.com/designingcode/status/753511397124866049 ## Does this MR meet the acceptance criteria? - [X ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See merge request !5246
| * | | | | | | Include default callback URL (OAuth)Chris Wilson2016-07-141-1/+2
|/ / / / / / /
* | | | | | | Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-133-14/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown rendering for label references Fixes #14424, #19753, #19760 See merge request !5224
| * | | | | | | Simplify regex for string-based multi-word label surrounded in quotesfix-label-reference-filterDouglas Barbosa Alexandre2016-07-131-1/+1
| | | | | | | |
| * | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-131-0/+1
| | | | | | | |
| * | | | | | | Doesn't match empty label references surrounded in quotesDouglas Barbosa Alexandre2016-07-131-1/+1
| | | | | | | |
| * | | | | | | Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre2016-07-132-15/+15
| | | | | | | |
| * | | | | | | Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre2016-07-132-1/+52
| | | | | | | |
| * | | | | | | Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre2016-07-132-1/+41
| | | | | | | |
* | | | | | | | Merge branch 'rails-4-2-7' into 'master' Robert Speicher2016-07-133-32/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rails from 4.2.6 to 4.2.7. Primarily just bug fixes. See merge request !5236
| * | | | | | | | Upgrade Rails from 4.2.6 to 4.2.7.Connor Shea2016-07-133-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Primarily just bug fixes. Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7