summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch 'master' into 'pages-0-7-0'Grzegorz Bizon2018-03-0740-172/+700
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: GITLAB_PAGES_VERSION
| * | | | | | | | | | | | Update GitLab Pages to v0.7.0Nick Thomas2018-03-071-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master'Clement Ho2018-03-072-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make margin around dropdown dividers 4px" Closes #39444 See merge request gitlab-org/gitlab-ce!17517
| * | | | | | | | | | | | | Set margins around dropdown dividers to 4px (based on grid)39444-make-margin-around-dropdown-dividers-4pxLukas Eipert2018-03-052-1/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher2018-03-072-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce number of FindCommit calls from RefsController#logs_tree Closes gitaly#1057 See merge request gitlab-org/gitlab-ce!17566
| * | | | | | | | | | | | | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-treeAhmad Sherif2018-03-062-6/+7
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitaly#1057 The old code was calling LastCommitForPath to extract a commit ID _then_ call FindCommit to get a commit it already had in the first place!
* | | | | | | | | | | | | | Merge branch '4326-fix-js-or-true' into 'master'Clement Ho2018-03-071-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a JS bug in the websocket terminal See merge request gitlab-org/gitlab-ce!17470
| * | | | | | | | | | | | | | Fix a JS bug in the websocket terminalNick Thomas2018-03-071-2/+8
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'patch-28-docs' into 'master'Robert Speicher2018-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to Pacific Time Zone [ci skip] See merge request gitlab-org/gitlab-ce!17600
| * | | | | | | | | | | | | | | Change to Pacific Time ZoneFabien Catteau2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The freeze time remains the same when switching to PDT (Daylight Saving Time), so it should be PT, not PST.
* | | | | | | | | | | | | | | | Merge branch 'fix/upgrade-grpc-to-1-1-0' into 'master'Robert Speicher2018-03-072-11/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade grpc gem to 1.10.0 See merge request gitlab-org/gitlab-ce!17575
| * | | | | | | | | | | | | | | Upgrade grpc gem to 1.10.0fix/upgrade-grpc-to-1-1-0Ahmad Sherif2018-03-062-11/+9
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to gitaly#1060
* | | | | | | | | | | | | | | Merge branch 'upgrade-workhorse-4.0.0' into 'master'Nick Thomas2018-03-072-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Workhorse to 4.0.0 See merge request gitlab-org/gitlab-ce!17606
| * | | | | | | | | | | | | | Upgrade Workhorse to 4.0.0upgrade-workhorse-4.0.0Kamil Trzciński2018-03-072-1/+6
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-0719-105/+635
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve: Modal and banner designs for project label and project milestone promotion Closes #41895 See merge request gitlab-org/gitlab-ce!17197
| * | | | | | | | | | | | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-0614-96/+36
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add persistent flash messagesJose Ivan Vargas2018-03-019-9/+73
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Changed selector names, address code concernsJose Ivan Vargas2018-03-0113-185/+183
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-0119-97/+625
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'doc-api-fix' into 'master'Sean McGivern2018-03-072-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor fixes in API doc See merge request gitlab-org/gitlab-ce!17602
| * | | | | | | | | | | | | | | Minor fixes in API docJan Provaznik2018-03-072-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'dz-use-less-deprecated-methods-2' into 'master'Douwe Maan2018-03-079-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Project#full_name instead of name_with_namespace See merge request gitlab-org/gitlab-ce!17601
| * | | | | | | | | | | | | | | | Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets2018-03-079-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-073-51/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make git push mandatory See merge request gitlab-org/gitlab-ce!17565
| * | | | | | | | | | | | | | | | naming thingsKim "BKC" Carlbäcker2018-03-071-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix specsgitaly-git-mandatoryKim "BKC" Carlbäcker2018-03-071-26/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Make git push mandatoryKim "BKC" Carlbäcker2018-03-062-25/+4
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-075-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'sh-fix-otp-backup-cherry-pick' into 'master'James Lopez2018-03-073-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'master' See merge request gitlab/gitlabhq!2349
| | * | | | | | | | | | | | | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-073-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
| * | | | | | | | | | | | | | | | Merge branch 'cherry-pick-2c6ce6ff' into 'master'James Lopez2018-03-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pages-6-1-gitlab-10-5' into 'master' See merge request gitlab/gitlabhq!2350
| | * | | | | | | | | | | | | | | Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5'Marin Jankovski2018-03-071-1/+1
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-pages version (GitLab 10.5) See merge request gitlab/gitlabhq!2330 (cherry picked from commit 2c6ce6ff3efe4e5a7a6dc9a79a48e9c5ebad1a29) 15f8d4a6 Update gitlab-pages version
| * | | | | | | | | | | | | | | Update CHANGELOG.md for 10.3.8Robert Speicher2018-03-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | Update CHANGELOG.md for 10.4.5Robert Speicher2018-03-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | Update CHANGELOG.md for 10.5.3Robert Speicher2018-03-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Merge branch 'docs/runner-cache-no-gc' into 'master'Marcia Ramos2018-03-071-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove wrong assumption about Runners cache GC See merge request gitlab-org/gitlab-ce!17598
| * | | | | | | | | | | | | | | Remove wrong assumption about Runners cache GCdocs/runner-cache-no-gcAchilleas Pipinellis2018-03-071-2/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/41249#note_60629323
* | | | | | | | | | | | | | | Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'Sean McGivern2018-03-074-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Ruby endpoints to OPT_OUT See merge request gitlab-org/gitlab-ce!17561
| * | | | | | | | | | | | | | Fix tests not completely disabling GitalyZeger-Jan van de Weg2018-03-071-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move OperationService#UserRemoveBranchZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#476
| * | | | | | | | | | | | | | Move OperationService#UserCreateBranchZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#476
| * | | | | | | | | | | | | | Move CommitService#Languages to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of: gitlab-org/gitlab-ce!17561
| * | | | | | | | | | | | | | Move RefService#CreateBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#540
| * | | | | | | | | | | | | | Move RefService#DeleteBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#546
| * | | | | | | | | | | | | | Move OperationService#UserRevert to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#779
| * | | | | | | | | | | | | | Move OperationService#UserAddTag to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#541
| * | | | | | | | | | | | | | Move CommitService::CommitPatch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of gitlab-org/gitaly#324
| * | | | | | | | | | | | | | Move Repository#HasLocalBranches to OPT_OUTZeger-Jan van de Weg2018-03-072-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of gitlab-org/gitaly#616
* | | | | | | | | | | | | | | Merge branch 'tc-geo-local-only-counts-matcher' into 'master'Nick Thomas2018-03-071-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of "Geo: Ignore remote stored objects when calculating counts" See merge request gitlab-org/gitlab-ce!17581
| * | | | | | | | | | | | | | Add matcher to match elements by idstc-geo-local-only-counts-matcherToon Claes2018-03-061-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially added in gitlab-org/gitlab-ee!4864 and gitlab-org/gitlab-ee!4689.
View Lorry Controller Status