summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.3.9v9.3.9James Edwards-Jones2017-07-201-1/+1
|
* Update CHANGELOG.md for 9.3.9James Edwards-Jones2017-07-202-4/+4
| | | [ci skip]
* Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-203-8/+45
| | | | | Fix an infinite loop in Gitlab:UntrustedRegexp See merge request !2146
* Update VERSION to 9.3.8v9.3.8James Edwards-Jones2017-07-191-1/+1
|
* Update CHANGELOG.md for 9.3.8James Edwards-Jones2017-07-195-16/+7
| | | [ci skip]
* Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3'Douwe Maan2017-07-194-1/+103
| | | | | | Remove the `appearance` symlink that was previously missed See merge request !2124
* Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-1911-21/+300
| | | | | Use uploads/system directory for personal snippets See merge request !2123
* Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'Sean McGivern2017-07-193-0/+44
| | | | | [9.3 security fix] Renders 404 if given project is not readable by the user on Todos dashboard See merge request !2118
* Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'Douwe Maan2017-07-199-4/+174
| | | | | | 24570 use re2 for user supplied regexp 9 3 See merge request !2129
* Merge branch 'issue-title-leakage' into 'security-9-3'Robert Speicher2017-07-1922-119/+88
| | | | | [9.3] Improve support for external issue references See merge request !2131
* Update VERSION to 9.3.7v9.3.7Clement Ho2017-07-181-1/+1
|
* Update CHANGELOG.md for 9.3.7Clement Ho2017-07-183-8/+5
| | | [ci skip]
* Merge branch '9-3-stable-patch-7' into '9-3-stable'Kushal Pandya2017-07-1710-14/+88
|\ | | | | | | | | Prepare 9.3.7 See merge request !12816
| * Merge branch '34325-reinstate-is_admin-for-user-api' into 'master'9-3-stable-patch-7Sean McGivern2017-07-125-6/+53
| | | | | | | | | | | | | | Return `is_admin` attribute in the GET /user endpoint for admins Closes #34325 See merge request !12811
| * Merge branch '34728-fix-application-setting-created-when-redis-down' into ↵Stan Hu2017-07-125-8/+35
|/ | | | | | | | | | 'master' Prevent bad data being added to application settings when Redis is unavailable Closes #34728 See merge request !12750
* Update VERSION to 9.3.6v9.3.6kushalpandya2017-07-121-1/+1
|
* Update CHANGELOG.md for 9.3.6kushalpandya2017-07-125-17/+7
| | | [ci skip]
* Merge branch '9-3-stable-patch-6' into '9-3-stable'Kushal Pandya2017-07-1128-46/+370
|\ | | | | | | | | Prepare 9.3.6 See merge request !12758
| * Merge branch '34909-pipeline-dropdown-z-index' into 'master'9-3-stable-patch-6Filipa Lacerda2017-07-111-1/+1
| | | | | | | | | | | | | | Increase z index of mini pipeline dropdown Closes #34909 See merge request !12767
| * Merge branch '34153-extend-mr-tabs' into 'master'Phil Hughes2017-07-111-2/+8
| | | | | | | | | | | | | | Extend MR tabs a bit to cover up the avatar holder and collapse icon on scroll Closes #34153 See merge request !12589
| * Merge branch 'grpc-1.4' into 'master'Sean McGivern2017-07-101-1/+1
| | | | | | | | | | | | | | Use grpc 1.4.0 Closes omnibus-gitlab#2414 See merge request !12387
| * Fix conflictClement Ho2017-07-101-5/+2
| |
| * Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-1015-38/+294
| | | | | | | | | | | | | | | | Fix API Scoping Closes #33580 and #33022 See merge request !12300
| * Merge branch 'dm-encode-tree-and-blob-paths' into 'master'Rémy Coutable2017-07-103-0/+13
| | | | | | | | | | | | | | Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths Closes #34529 See merge request !12636
| * Merge branch 'sh-disable-flipper-midddlware-tests' into 'master'Rémy Coutable2017-07-101-2/+4
| | | | | | | | | | | | | | Disable Flipper memoizer in tests to avoid transient failures Closes #34278 See merge request !12656
| * Merge branch 'dm-mysql-log_bin_trust_function_creators' into 'master'Sean McGivern2017-07-102-1/+25
| | | | | | | | | | Mention that 9.3 also needs `log_bin_trust_function_creators` on MySQL. See merge request !12687
| * Merge branch 'issue-description-gfm' into 'master'Filipa Lacerda2017-07-103-0/+17
| | | | | | | | | | | | | | Fixed GFM references not being included when update issue inline Closes gitlab-ee#2878 See merge request !12720
| * Merge branch 'username-password-stripped-from-import-url-fix' into 'master'Douwe Maan2017-07-102-0/+9
|/ | | | | Username and password are no longer stripped from import url on import See merge request !12725
* Fixed CHANGELOG.md for 9.3.4 releaseJames Edwards-Jones2017-07-061-1/+1
|
* 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
View Lorry Controller Status