summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-184-1/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
| * Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-184-1/+13
| | | | | | | | | | | | | | | | This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'pending-tab' into 'master' Rémy Coutable2016-07-182-5/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Pending Tab to Builds ## What does this MR do? Add Pending Tab to Builds and separate "running" and "pending" jobs in UI. ## Why was this MR needed? Increase visibility to "pending" . ## What are the relevant issue numbers? Closes #19408 ## Screenshots Before: ![Zrzut_ekranu_2016-07-05_o_11.52.48](/uploads/01dc1f3664f5aacb2ec09d52d19c521e/Zrzut_ekranu_2016-07-05_o_11.52.48.png) After: ![Zrzut_ekranu_2016-07-05_o_11.51.34](/uploads/f3be02427996fecf50c65dd51ce1b9fb/Zrzut_ekranu_2016-07-05_o_11.51.34.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) cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin @zj [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5084
| * | Remove unused .js-running-count classKatarzyna Kobierska2016-07-182-6/+6
| | |
| * | Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-182-2/+12
| |/ | | | | | | | | | | Add Pending Tab to Project Builds Update CHANGELOG
* | Merge branch 'fix-stage-status-show-for-pipelines' into 'master' Rémy Coutable2016-07-181-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stage status shown for pipelines ## What does this MR do? Properly calculates a status of stage when shown on a list of pipelines ## Why was this MR needed? Previously we were calculating a status for all builds, including retried ones. This were affecting a overall stage status when a build were retried. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18896 https://gitlab.com/gitlab-org/gitlab-ce/issues/18150 - [ ] [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 !5277
| * Fix stage status shown for pipelinesfix-stage-status-show-for-pipelinesKamil Trzcinski2016-07-151-1/+1
| |
* | Align cancel and retry buttons19907-deployAnnabel Dunstone2016-07-161-1/+1
| |
* | Remove deploy to production buttonAnnabel Dunstone2016-07-161-10/+1
| |
* | Merge branch 'legacy-diff-notes-are-dumb' into 'master' Douwe Maan2016-07-151-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Don't fail when a LegacyDiffNote didn't store the right diff Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/8865/ and https://sentry.gitlap.com/gitlab/gitlabcom/issues/8754/ See merge request !5287
| * | Don't fail when a LegacyDiffNote didn't store the right diffDouwe Maan2016-07-151-1/+1
| | |
* | | Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-154-25/+37
|/ / | | | | This reverts merge request !4970
* | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-152-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow U2F devices to be used in Firefox - Adds U2F support for Firefox - Improve U2F feature detection logic - Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`) - Closes #17341 - Related to #15337 See merge request !5177
| * | Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2fTimothy Andrew2016-07-142-4/+4
| | | | | | | | | | | | | | | 1. This scenario was previously tested for the registration flow, but not authentication.
| * | Load Javascript U2F library selectively.Timothy Andrew2016-07-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Only on supported Chrome versions 2. Mainly, this lets us simplify the javascript-based U2F check to `window.u2f`, where `window.u2f` can either be loaded from the GitLab server (for Chrome) or from the Firefox extension. 3. This is a better way to provide browser detection for U2F.
* | | Merge branch 'fix-creating-group-with-space-in-group-path'Douwe Maan2016-07-151-1/+1
|\ \ \
| * | | Fix creating group with space in group pathDouglas Barbosa Alexandre2016-07-141-1/+1
| | | |
* | | | Merge branch 'revert-lock-for-issuable' into 'master' Robert Speicher2016-07-151-9/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Optimistic locking for Issue and Merge Requests" The migration to add `lock_version` in !5146 to every issue and merge request takes too long on GitLab.com since it has to add a default value of 0 to every row. Unfortunately, Rails 4.2 doesn't work properly if the value is left as `nil`; anything using optimistic locking cannot be edited. This bug was fixed in Rails 5.0 via this commit: https://github.com/rails/rails/commit/13772bfa49325a8dc26410d2dcb555665a320f92. I suggest we revert this change for now, and when we upgrade to Rails 5.0 we can reintroduce this feature. See merge request !5245
| * | | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-131-9/+0
| | | | | | | | | | | | | | | | This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.
* | | | Merge branch 'issuable-sidebar-collapsed-tooltip' into 'master' Fatih Acet2016-07-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed collapsed assignee tooltip to users name ## What does this MR do? - Changes the collapsed assignee tooltip the users name rather than the username - Updates the tooltip after updating the assignee ## What are the relevant issue numbers? Closes #19280, #19281 ## Screenshots (if relevant) ![Screen_Shot_2016-06-28_at_17.55.52](/uploads/e6ccc1703f59966c978e731a841aabdc/Screen_Shot_2016-06-28_at_17.55.52.png) See merge request !4976
| * | | | Changed collapsed assignee tooltip to users namePhil Hughes2016-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltip when updating the assignee Closes #19280 #19281
* | | | | Merge branch 'fix-navbar-icon' into 'master' Fatih Acet2016-07-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navbar_icon was renamed to custom_icon In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4909 it's still using `navbar_icon` but now it's renamed to `custom_icon` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5156 /cc @iamphill @smcgivern @annabeldunstone See merge request !5265
| * | | | | navbar_icon was renamed to custom_icon in:fix-navbar-iconLin Jen-Shin2016-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/commit/c57471ddb456c9640f6d77128e1fc56c7a5b35b2 navbar_icon was used in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4909
* | | | | | Merge branch '4424-improve-ui-admin-area' into 'master' Dmitriy Zaporozhets2016-07-153-19/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address UI feedback for admin area ## What does this MR do? Addresses @dzaporozhets's feedback for !4424 ## Why was this MR needed? !4424 was merged with some design issues which affected other areas of the app and broke consistency. This MR fixes that. ## What are the relevant issue numbers? #3946 ## 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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5190
| * | | | | | Add visibility icon4424-improve-ui-admin-areaAlfredo Sumaran2016-07-141-0/+3
| | | | | | |
| * | | | | | Make admin/groups view consistent with dashboard/groupsAlfredo Sumaran2016-07-141-17/+20
| | | | | | |
| * | | | | | Rename .group-controls to .controlsAlfredo Sumaran2016-07-141-1/+1
| | | | | | |
| * | | | | | Remove unnecesary CSS classAlfredo Sumaran2016-07-142-2/+2
| | | | | | |
* | | | | | | Merge branch 'update-permissions-links' into 'master' Achilleas Pipinellis2016-07-155-6/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update permissons links to new page https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5210 updated the location in the docs, but we link to this page a bunch in the app too. See merge request !5247
| * | | | | | Update permissons links to new pageupdate-permissions-linksSean McGivern2016-07-145-6/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | permissions/permissions just links to user/permissions since https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5210
* | | | | | Merge branch 'gl-dropdown-issuable-form' into 'master' Jacob Schatz2016-07-154-37/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL dropdowns in issuable form ## What does this MR do? Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable. ## What are the relevant issue numbers? Closes #12574 ## Screenshots (if relevant) See merge request !4970
| * | | | | | Updated testsPhil Hughes2016-07-071-2/+3
| | | | | | |
| * | | | | | GL dropdowns in issuable formPhil Hughes2016-07-074-37/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows labels to be created on whilst creating/editing an issuable Closes #12574
* | | | | | | Merge branch 'projects-blank-state' into 'master' Jacob Schatz2016-07-155-65/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects blank state ## What does this MR do? Adds a designed blank state to dashboard/projects ## What are the relevant issue numbers? Part of #18519 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_17.14.46](/uploads/593ea1c5efa2310a0f94b2d56d94cf3c/Screen_Shot_2016-06-24_at_17.14.46.png) See merge request !4909
| * | | | | | | Dashboard projects blank stateprojects-blank-statePhil Hughes2016-07-085-65/+47
| | | | | | | |
* | | | | | | | Merge branch 'compare-dropdowns' into 'master' Jacob Schatz2016-07-152-12/+10
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated compare dropdowns ## What does this MR do? Removes jQuery autocomplete from compare fields and replaces with GitLabs dropdowns. ## What are the relevant issue numbers? Closes #18891 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_14.24.34](/uploads/f34370390183429f604fc48645390f2f/Screen_Shot_2016-06-24_at_14.24.34.png) See merge request !4895
| * | | | | | | Updated dropdowns to use field insteadPhil Hughes2016-07-083-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows a bit more flexibilty and keeps the current functionality
| * | | | | | | Updated compare dropdownsPhil Hughes2016-07-083-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18891
* | | | | | | | Add margin between buttons if both retry and cancel are presentAnnabel Dunstone2016-07-141-6/+7
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-142-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'lbennett/gitlab-ce-18120-focus-filter-shortcut' into 'master' Fatih Acet2016-07-141-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Added shortcut to focus all search tags apart from the top nav searchLuke "Jared" Bennett2016-07-111-0/+4
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-141-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12797
* | | | | | | | Improves left static sidebar behaviourDmitriy Zaporozhets2016-07-141-1/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-134-13/+1
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
* | | | | | Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix typos, minor styling errors. 2. Use single quotes rather than double quotes in `user_access_spec`. 3. Test formatting.
* | | | | | Don't ask the user to "merge this request manually".Timothy Andrew2016-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 1. If they are a developer with "Developers can Merge" switched on.