summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 8.10.0-rc6v8.10.0-rc6Robert Speicher2016-07-151-1/+1
|
* Merge branch 'master' into 8-10-stableRobert Speicher2016-07-153-0/+15
|\
| * Merge branch 'disable-statement-timeout' into 'master' Robert Speicher2016-07-153-0/+15
| |\ | | | | | | | | | | | | | | | | | | Disable PostgreSQL statement timeout during migrations Long-running migrations may take more than the timeout allowed by the database. Disable the session's statement timeout to ensure migrations don't get killed prematurely. See merge request !5263
| | * Fix spec Don't attempt to disable statement timeout on a MySQL DBdisable-statement-timeoutStan Hu2016-07-141-0/+4
| | |
| | * Disable statement timeout outside of transaction and during adding ↵Stan Hu2016-07-141-1/+3
| | | | | | | | | | | | concurrent index
| | * Disable PostgreSQL statement timeout during migrationsStan Hu2016-07-142-0/+9
| | | | | | | | | | | | | | | | | | Long-running migrations may take more than the timeout allowed by the database. Disable the session's statement timeout to ensure migrations don't get killed prematurely.
* | | Merge branch 'master' into 8-10-stableRobert Speicher2016-07-1573-375/+626
|\ \ \ | |/ /
| * | Merge branch 'fix/import-issues-last-updated' into 'master' Robert Speicher2016-07-154-26/+41
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues last update timestamp not preserved after importing a project Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19689 and https://gitlab.com/gitlab-org/gitlab-ce/issues/19792 (similar, but not the same) Now `updated_at` should be the time from the original project. See merge request !5253
| | * | updated changelogfix/import-issues-last-updatedJames Lopez2016-07-141-0/+1
| | | |
| | * | fixed similar issue with gitlab.com importer because why not!James Lopez2016-07-141-25/+28
| | | |
| | * | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-142-1/+12
| | | |
| * | | Merge branch 'collapse-diffs-more' into 'master' Fatih Acet2016-07-151-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce padding on collapsed diff message ## What does this MR do? Reduce the padding on the collapsed diff message so it takes up less space. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Collapsed diffs took up too much space before. ## Screenshots (if relevant) Before: ![image](/uploads/62c6fe19439bc3bc91bde83df72e7004/image.png) After: ![image](/uploads/ec89230065c37fc4022d949d1233a90d/image.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~~ - [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 !5256
| | * | | Change bg color of collapsed diff to blue on hovercollapse-diffs-moreAnnabel Dunstone2016-07-141-0/+5
| | | | |
| | * | | Reduce padding on collapsed diff messageSean McGivern2016-07-141-0/+1
| | | | |
| * | | | Merge branch 'issuable-sidebar-collapsed-tooltip' into 'master' Fatih Acet2016-07-153-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | CHANGELOGissuable-sidebar-collapsed-tooltipPhil Hughes2016-07-131-0/+1
| | | | | |
| | * | | | Changed collapsed assignee tooltip to users namePhil Hughes2016-07-132-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-157-54/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | |
| | * | | | | | 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 'update-permissions-links' into 'master' Achilleas Pipinellis2016-07-156-7/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-146-7/+7
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | permissions/permissions just links to user/permissions since https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5210
| * | | | | | Merge branch 'update-branch-names-in-gc' into 'master' Jacob Vosmaer (GitLab)2016-07-153-3/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refresh branch cache after `git gc` As discussed in !5160, we should refresh the branch name list after expiring to make sure we are in a good state and that we do not affect view performance (as much). See merge request !5235
| | * | | | | | Refresh branch cache after `git gc`Stan Hu2016-07-133-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible workaround for #15392
| * | | | | | | Merge branch 'gl-dropdown-issuable-form' into 'master' Jacob Schatz2016-07-1516-65/+72
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | Dropdown chevron alignmentgl-dropdown-issuable-formPhil Hughes2016-07-071-1/+1
| | | | | | | | |
| | * | | | | | | Updated testsPhil Hughes2016-07-078-17/+16
| | | | | | | | |
| | * | | | | | | GL dropdowns in issuable formPhil Hughes2016-07-079-50/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows labels to be created on whilst creating/editing an issuable Closes #12574
| * | | | | | | | Merge branch 'projects-blank-state' into 'master' Jacob Schatz2016-07-157-82/+56
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-087-82/+56
| | | | | | | | | |
| * | | | | | | | | Merge branch 'compare-dropdowns' into 'master' Jacob Schatz2016-07-158-16/+122
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | Fixed submit button not enablingcompare-dropdownsPhil Hughes2016-07-082-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tests
| | * | | | | | | | Added tests for compare dropdownsPhil Hughes2016-07-082-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG
| | * | | | | | | | Updated dropdowns to use field insteadPhil Hughes2016-07-089-40/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows a bit more flexibilty and keeps the current functionality
| | * | | | | | | | Updated compare dropdownsPhil Hughes2016-07-086-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18891
| * | | | | | | | | 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
View Lorry Controller Status