summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.3.5v9.3.5James Edwards-Jones2017-07-051-1/+1
|
* Update CHANGELOG.md for 9.3.5James Edwards-Jones2017-07-056-21/+8
| | | [ci skip]
* Merge branch '9-3-stable-patch-5' into 9-3-stableJames Edwards-Jones2017-07-0534-68/+354
|\
| * Fix for spec failure in gitaly_client/ref_spec.rb on stable9-3-stable-patch-5James Edwards-Jones2017-07-051-1/+1
| | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12534
| * Merge branch 'bump-prometheus-version-to-fix-text-representation-problem' ↵Grzegorz Bizon2017-07-041-2/+2
| | | | | | | | | | | | | | | | into 'master' Update prometheus client gem See merge request !12632
| * Merge branch '34470-fix-award-slash-command-placeholder' into 'master'Phil Hughes2017-07-042-0/+49
| | | | | | | | | | | | | | | | Remove placeholder note when award emoji slash command is applied Closes #34470 See merge request !12545
| * Revert "Merge branch 'fix/gb/qa/use-latest-chrome-version-in-qa-dockerfile' ↵James Edwards-Jones2017-07-041-6/+9
| | | | | | | | | | | | into 'master'" This reverts commit 9b0e44bf1f0b924d87802a3f5ecf6df3fdeb72a7.
| * Merge branch 'fix-2801' into 'master'Sean McGivern2017-07-047-2/+43
| | | | | | | | | | | | | | | | Expires full_path cache after a repository is renamed/transferred Closes gitlab-ee#2801 See merge request !12575
| * Merge branch '34525-backport-update-go-to-91-92-guide' into 'master'Sean McGivern2017-07-042-16/+34
| | | | | | | | | | | | | | Make clear that Go 1.8 is required since GitLab 9.2 Closes #34525 See merge request !12564
| * Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as ↵PAB2017-07-041-2/+2
| | | | | | | | the upgrade fails with Go 1.5 (installed with Gitlab 8.1)
| * Merge branch 'fix/gb/qa/use-latest-chrome-version-in-qa-dockerfile' into ↵Rémy Coutable2017-07-041-9/+6
| | | | | | | | | | | | | | | | 'master' Use latest chrome and chrome driver in GitLab QA See merge request !12475
| * Merge branch 'bvl-validate-path-update' into 'master'Douwe Maan2017-07-043-9/+18
| | | | | | | | | | | | | | Rebuild the dynamic path before validating it Closes #33746 See merge request !12213
| * Merge branch 'dm-always-verify-source-branch-can-be-deleted' into 'master'Sean McGivern2017-07-043-13/+69
| | | | | | | | | | | | | | | | Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Closes #34456 See merge request !12574
| * Merge branch 'dm-9-3-requires-mysql-trigger' into 'master'Sean McGivern2017-07-043-6/+15
| | | | | | | | | | | | | | Document that GitLab 9.3 requires the TRIGGER permission on MySQL Closes #34358 See merge request !12573
| * Merge branch 'tc-no-delete-protected-merged-branches' into 'master'Rémy Coutable2017-07-043-0/+14
| | | | | | | | | | | | | | DeleteMergedBranchesService should not delete protected branches Closes #34553 See merge request !12624
| * Merge branch ↵Grzegorz Bizon2017-07-042-2/+5
| | | | | | | | | | | | | | | | | | '32885-unintentionally-removing-branch-when-merging-merge-request' into 'master' Set default for "Remove source branch" to false Closes #32885 See merge request !12576
| * Merge branch ↵Rémy Coutable2017-07-043-1/+50
| | | | | | | | | | | | | | | | | | '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updated' into 'master' Fix a bug where an invalid sort param value was passed to Gitaly Closes #34280 See merge request !12534
| * Merge branch ↵Phil Hughes2017-07-045-4/+27
| | | | | | | | | | | | | | | | | | '34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails' into 'master' Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Closes #34097 See merge request !12430
| * Merge branch '33861-more-actions-dropdown-hidden-by-end-of-diff' into 'master'Annabel Dunstone Gray2017-07-041-2/+0
| | | | | | | | | | | | | | Resolve "More actions dropdown hidden by end of diff" Closes #33861 See merge request !12380
| * Merge branch ↵Phil Hughes2017-07-041-0/+4
| | | | | | | | | | | | | | | | | | '33734-transient-karma-failure-on-master-for-date-time-utils-timefor-returns-remaining-time-when-in-the-future' into 'master' Resolve "Transient karma failure on master for `Date time utils timeFor returns remaining time when in the future`" Closes #33734 See merge request !12227
| * Merge branch '9-3-allow-force-repo-create' into '9-3-stable-patch-5'James Edwards-Jones2017-07-032-11/+24
| |\ | | | | | | | | | | | | Add an option to force Project#create_repository create a repository See merge request !12593
| | * Add an option to force Project#create_repository create a repository9-3-allow-force-repo-createDouglas Barbosa Alexandre2017-07-032-11/+24
| |/
* | Update VERSION to 9.3.4v9.3.4James Edwards-Jones2017-07-031-1/+1
| |
* | Update CHANGELOG.md for 9.3.4James Edwards-Jones2017-07-031-0/+4
| | | | | | [ci skip]
* | Update GITLAB_SHELL_VERSION to 5.1.1James Edwards-Jones2017-07-031-1/+1
|/ | | | | | Update to >= 5.1.0 needed for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2240 on EE. Updated here to keep CE and EE on the same version. 5.1.1 includes https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/142 to revert changes which were causing problems with Post Receive hooks.
* Update VERSION to 9.3.3v9.3.39-3-stable-patch-4James Edwards-Jones2017-06-301-1/+1
|
* Update CHANGELOG.md for 9.3.3James Edwards-Jones2017-06-307-25/+9
| | | [ci skip]
* Merge branch '34461-top-banner-job' into '9-3-stable'Phil Hughes2017-06-302-43/+49
|\ | | | | | | | | Calculate top position with flash message after the request is received See merge request !12556
| * Calculate top position with flash message after the request is receivedFilipa Lacerda2017-06-302-43/+49
|/
* Merge branch '9-3-stable-patch-3-mysql' into '9-3-stable'James Edwards-Jones2017-06-3031-90/+322
|\ | | | | | | | | Prepare 9.3.3 Release See merge request !12508
| * Merge branch '34407-flickering-scroll-v1' into 'master'9-3-stable-patch-3-mysqlAnnabel Dunstone Gray2017-06-291-3/+5
| | | | | | | | | | | | | | Fix scroll flicker Closes #34407 See merge request !12501
| * Merge branch 'fix-34417' into 'master'Sean McGivern2017-06-293-17/+48
| | | | | | | | | | | | | | Perform housekeeping only when an import of a fresh project is completed Closes #34417 See merge request !12529
| * Merge branch 'highest-return-on-diff-investment' into 'master'Sean McGivern2017-06-292-1/+5
| | | | | | | | | | | | | | Bring back branches badge to main project page Closes #34438 See merge request !12548
| * Merge branch 'jej/run-mysql-tests-on-stable-preparation-branches' into 'master'Rémy Coutable2017-06-291-1/+1
| | | | | | | | | | Run mysql tests on stable preperation branches like 9-3-stable-patch-2 See merge request !12552
| * Merge branch 'issue-boards-closed-list-all' into 'master'Sean McGivern2017-06-293-3/+15
| | | | | | | | | | | | | | Fixed issue boards closed list not listing all issues Closes #33850 See merge request !12271
| * Merge branch 'issue-form-multiple-line-markdown-stable' into ↵Filipa Lacerda2017-06-293-36/+81
| |\ | | | | | | | | | | | | | | | | | | '9-3-stable-patch-3-mysql' Issue form multiple line markdown stable See merge request !12549
| | * fixed tests against phantomjsissue-form-multiple-line-markdown-stablePhil Hughes2017-06-291-1/+9
| | |
| | * Fixed multi-line markdown in issue edit formPhil Hughes2017-06-293-38/+75
| | | | | | | | | | | | Closes #34318
| * | Merge branch 'gitaly-encodings' into 'master'Robert Speicher2017-06-294-11/+44
| |/ | | | | | | | | | | | | | | Fix gitaly ref encoding bugs Closes #34156 See merge request !12522
| * Merge branch '34430-fix-double-escape-comment-edit' into 'master'Phil Hughes2017-06-281-1/+1
| | | | | | | | | | | | | | | | Remove unnecessary call to `_.escape` Closes #34430 See merge request !12505
| * Merge branch 'fix-head-pipeline-for-commit-status' into 'master'Grzegorz Bizon2017-06-283-6/+28
| | | | | | | | | | | | | | Fix head pipeline stored in merge request for external pipelines Closes #34130 See merge request !12478
| * Merge branch 'patch-24' into 'master'Rémy Coutable2017-06-281-3/+3
| | | | | | | | | | Fix the numbering of steps in the 9.2 to 9.3 upgrade guide See merge request !12498
| * Merge branch 'dm-dependency-linker-newlines' into 'master'Robert Speicher2017-06-283-1/+10
| | | | | | | | | | | | | | Fix diff of requirements.txt file by not matching newlines as part of package names Closes #34321 See merge request !12495
| * Merge branch 'winh-no-current-user-search-bar' into 'master'Clement Ho2017-06-285-7/+80
| | | | | | | | | | Add condition if there is a current user to DropdownUser See merge request !12415
| * Merge branch 'acet-fix-job-sidebar-overflow' into 'master'Jacob Schatz2017-06-281-0/+1
|/ | | | | | | Jobs: Fix job sidebar overflow issue. Closes #34080 See merge request !12366
* Update VERSION to 9.3.2v9.3.2Clement Ho2017-06-271-1/+1
|
* Update CHANGELOG.md for 9.3.2Clement Ho2017-06-273-9/+5
| | | [ci skip]
* Merge branch '9-3-stable-patch-2' into '9-3-stable'Clement Ho2017-06-2829-39/+124
|\ | | | | | | | | Prepare 9.3.2 See merge request !12493
| * Merge branch 'revert-99bdfd18' into '9-3-stable-patch-2'9-3-stable-patch-2Clement Ho2017-06-273-75/+38
| |\ | | | | | | | | | | | | Revert "Merge branch 'issue-form-multiple-line-markdown' into 'master'" See merge request !12500
| | * Revert "Merge branch 'issue-form-multiple-line-markdown' into 'master'"Clement Ho2017-06-273-75/+38
| |/ | | | | This reverts merge request !12458
View Lorry Controller Status