summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.0.0v9.0.0James Lopez2017-03-221-1/+1
|
* Update CHANGELOG.md for 9.0.0James Lopez2017-03-22281-1128/+283
| | | [ci skip]
* Update VERSION to 9.0.0-rc7v9.0.0-rc7DJ Mountney2017-03-211-1/+1
|
* Merge branch 'dm-fix-vue-cant-compile-some-discussions' into 'master' Robert Speicher2017-03-211-1/+1
| | | | | Escape values passed from Rails to Vue to make sure the template can be compiled See merge request !10122
* Merge branch 'fix-routes-index-migration' into 'master' Douwe Maan2017-03-211-2/+2
| | | | | Fix routes index migration See merge request !10121
* Merge branch 'tc-fix-project-create-500' into 'master'Douwe Maan2017-03-214-0/+22
| | | | | | | Fix for creating a project through API when import_url is nil Closes #29121 See merge request !9841
* Merge branch '29583-routes-like-fix' into 'master' Sean McGivern2017-03-215-7/+36
| | | | | | | Escape route path for LIKE queries Closes #29583 See merge request !10117
* Merge branch 'revert-37328406' into 'master' Rémy Coutable2017-03-216-56/+8
| | | | | | | Revert "Merge branch '29534-todos-performance' into 'master'" Closes #29758 See merge request !10116
* Merge branch ↵Rémy Coutable2017-03-214-13/+17
| | | | | | | | | | '29302-improve-the-prometheus-queries-for-multiple-container-environments' into 'master' Resolve "Fix the Prometheus queries for multiple container environments" Closes #29302 See merge request !9949
* Merge branch 'sh-fix-issue-29739' into 'master' Sean McGivern2017-03-212-4/+15
| | | | | | | Fix Error 500 when Bitbucket importer does not have authorization Closes #29739 See merge request !10105
* Merge branch 'gitaly-install-rake' into 'master'Robert Speicher2017-03-2113-16/+330
| | | | | | | | Docs and scripts to install Gitaly from source Closes gitaly#136 and #28446 See merge request !9941
* Merge branch '28618-fix-circular-dependency' into 'master' Alfredo Sumaran2017-03-211-4/+4
| | | | | | | Resolve "Circular dependency detected" (duplicate) Closes #28618 See merge request !10113
* Merge branch '29659-add-padding' into 'master' Filipa Lacerda2017-03-211-0/+4
| | | | | | | Add space to bottom of screen Closes #29659 and #23737 See merge request !10098
* Merge branch 'source-branch-toggle-text' into 'master' Filipa Lacerda2017-03-212-1/+7
| | | | | | | Fixed source branch name not being in new merge request dropdown toggle Closes #29660 See merge request !10080
* Merge branch 'fix-invalid-yaml-in-changelog-entry' into 'master' Sean McGivern2017-03-211-1/+1
| | | | | Fix invalid YAML in changelogs/unreleased/27142-api-replace-destroy-with-stop-environment.yml See merge request !10111
* Merge branch 'api-project-issues-404' into 'master' Sean McGivern2017-03-215-2/+18
| | | | | | | Return 404 in project issues API endpoint when project cannot be found Closes #29631 See merge request !10093
* Merge branch 'create-branch-service-create-file' into 'master' Sean McGivern2017-03-212-3/+27
| | | | | | | Fix CreateBranchService after Repository#commit_file was renamed to create_file Closes #29687 See merge request !10081
* Merge branch '29618-clarify-help-text-on-prometheus-integration-page' into ↵Douwe Maan2017-03-211-1/+8
| | | | | | | | | | 'master' Clarify help text on Prometheus Integration Page Closes #29618 See merge request !10034
* Merge branch 'dz-hide-share-group-ancestors' into 'master' Douwe Maan2017-03-214-2/+29
| | | | | | | Hide ancestor groups in the share group dropdown list Closes #29311 See merge request !9965
* Merge branch 'dz-improve-rename-projects-migration' into 'master' Yorick Peterse2017-03-211-30/+1
| | | | | | | Improve rename projects migration Closes #29556 See merge request !10009
* Merge branch 'index-routes-path-for-like' into 'master'Douwe Maan2017-03-213-4/+36
| | | | | | | | Add LIKE index for routes.path Closes #29554 See merge request !10060
* Merge branch ↵Sean McGivern2017-03-217-17/+89
| | | | | | | | | | '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master' Fix ProjectWiki#http_url_to_repo signature Closes #29685 See merge request !10079
* Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' Kamil Trzciński2017-03-212-0/+19
| | | | | | | Fix pipeline status for transition between stages Closes #29699 See merge request !10094
* fix eslint errorsJames Lopez2017-03-211-1/+3
|
* Merge branch 'perf/add-index-to-user-ghost' into 'master' Douwe Maan2017-03-212-3/+28
| | | | | add an index to the ghost column See merge request !9910
* Merge branch '29730-9-0-upgrade-documentation-should-include-yarn' into ↵Filipa Lacerda2017-03-211-4/+4
| | | | | | | | | | 'master' Resolve "9.0 upgrade documentation should include Yarn" Closes #29730 See merge request !10101
* Merge branch 'fix-input-token-spacing' into 'master' Annabel Dunstone Gray2017-03-211-4/+6
| | | | | Fix input token spacing See merge request !10090
* Merge branch ↵Achilleas Pipinellis2017-03-211-11/+5
| | | | | | | | '29713-update-documentation-to-reflect-prometheus-monitors-k8s-by-default' into 'master' Update docs to indicate prometheus k8s monitoring is on by default See merge request !10089
* Merge branch 'clear-page-param-after-filter-in-add-issues-modal' into 'master' Alfredo Sumaran2017-03-211-0/+4
| | | | | | | Reset issue boards add issues modal page when filtering Closes #29616 See merge request !10039
* Merge branch 'reset-filters-after-click' into 'master' Alfredo Sumaran2017-03-212-1/+22
| | | | | | | Reset filters after click Closes #28463 See merge request !10024
* Merge branch '29559-issue-count' into 'master'Filipa Lacerda2017-03-212-3/+20
| | | | | | | | handle commas in Issue total count Closes #29559 See merge request !10028
* Merge branch 'add-filter-focus-style' into 'master' Alfredo Sumaran2017-03-213-4/+52
| | | | | Add filter focus for filtered search visual tokens See merge request !9875
* Merge branch 'fix-prometheus-including-d3-main-bundle' into 'master'Alfredo Sumaran2017-03-216-21/+32
| | | | | | | | Removed d3.js from the main application.js bundle Closes #29608 See merge request !10062
* Merge branch 'issue-filter-bar-alignment' into 'master'Annabel Dunstone Gray2017-03-212-3/+13
| | | | | | | | Fixed filter bar alignment issues Closes #29543 See merge request !10049
* Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-215-2/+67
| | | | | | | Fix Error 500 when application settings are saved Closes #29674 and #29115 See merge request !10070
* Merge branch 'routes-lower-case' into 'master' Yorick Peterse2017-03-212-4/+10
| | | | | Remove repeated routes.path check for postgresql database See merge request !10063
* Merge branch 'token-bug-fixes' into 'master'Clement Ho2017-03-211-2/+1
| | | | | | | Align filtered search visual tokens with input field text Closes #29167 See merge request !10095
* Merge branch 'rs-issue-29592' into 'master' Stan Hu2017-03-212-3/+11
| | | | | | | Handle Route#name being nil after an update Closes #29592 See merge request !10102
* Merge branch '28499-fix-large-text-tooltip-in-diff-file-name' into 'master' Filipa Lacerda2017-03-212-0/+10
| | | | | | | fixes large text tooltip in diff file name Closes #28499 See merge request !9529
* Merge remote-tracking branch 'origin/9-0-stable' into 9-0-stableDJ Mountney2017-03-201-1/+2
|\
| * Merge branch 'issue-boards-fitlers-hide-mobile' into '9-0-stable' Filipa Lacerda2017-03-201-1/+2
| |\ | | | | | | | | | | | | Hide issue board filters on mobile See merge request !10078
| | * Hide issue board filters on mobilePhil Hughes2017-03-201-1/+2
| | | | | | | | | | | | Closes #29680
* | | Update VERSION to 9.0.0-rc6v9.0.0-rc6DJ Mountney2017-03-201-1/+1
| | |
* | | Merge branch '9-0-stable' into 9-0-stable-devLin Jen-Shin2017-03-2023-53/+173
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * 9-0-stable: Merge branch 'protobuf-3.2.0.2' into 'master' Merge branch '28890-allow-creating-mr-without-target-branch-in-url' into 'master' Merge branch '24683-sidebar-spinners' into 'master' Merge branch '29534-todos-performance' into 'master' Merge branch '29586-pipelines-tabs' into 'master' Merge branch 'fix/regressions-in-ci-v4-api' into 'master'
| * | Merge branch 'protobuf-3.2.0.2' into 'master' Rémy Coutable2017-03-201-1/+1
| | | | | | | | | | | | | | | Use google-protobuf 3.2.0.2 See merge request !10014
| * | Merge branch '28890-allow-creating-mr-without-target-branch-in-url' into ↵Sean McGivern2017-03-204-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow creating merge request even if target branch is not specified in query params Closes #28890 See merge request !9968
| * | Merge branch '24683-sidebar-spinners' into 'master'Alfredo Sumaran2017-03-206-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | don't show loading spinners for server-rendered sidebar fields Closes #24683 See merge request !9983
| * | Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-206-8/+56
| | | | | | | | | | | | | | | Todos performance: Include associations in Finder See merge request !10076
| * | Merge branch '29586-pipelines-tabs' into 'master' Annabel Dunstone Gray2017-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | | Remove width from nav links Closes #29586 See merge request !10051
| * | Merge branch 'fix/regressions-in-ci-v4-api' into 'master' Kamil Trzciński2017-03-205-29/+91
| |/ | | | | | | | | Fix regressions introduced while adding CI endpoints in API v4 See merge request !9952