summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Access metadata directly from Object StorageKamil Trzciński2018-07-0912-219/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we would pull the file, now, we just stream-it as needed from Object Storage
* | | | | | | | | Merge branch '48537-update-avatar-only-via-api' into 'master'Rémy Coutable2018-07-103-1/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "PUT /projects/:id : unable to update avatar alone" Closes #48537 See merge request gitlab-org/gitlab-ce!20505
| * | | | | | | | | Fix #48537 - Update avatar only via the projects APIJamie Schembri2018-07-093-1/+21
| | | | | | | | | |
* | | | | | | | | | Merge branch '42415-omit-projects-from-get-group-endpoint' into 'master'Douwe Maan2018-07-104-5/+55
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API: /groups/:name query very slow for groups with many projects" Closes #42415 See merge request gitlab-org/gitlab-ce!20494
| * | | | | | | | | | Adds with_projects optional parameter to /groups/:id API endpointTiago Botelho2018-07-094-5/+55
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'winh-mounthelper-path-docs' into 'master'Filipa Lacerda2018-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mountComponent helper path in docs See merge request gitlab-org/gitlab-ce!20511
| * | | | | | | | | | Fix mountComponent helper path in docsWinnie Hellmann2018-07-091-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'winh-stop-all-environments' into 'master'Phil Hughes2018-07-1032-737/+994
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support manually stopping any environment from the UI Closes #25388 See merge request gitlab-org/gitlab-ce!20077
| * | | | | | | | | | Support manually stopping any environment from the UIWinnie Hellmann2018-07-1032-737/+994
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '48951-clean-up' into 'master'Phil Hughes2018-07-105-66/+56
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "MR refactor: All actions under diff module are being exported twice" Closes #48951 See merge request gitlab-org/gitlab-ce!20499
| * | | | | | | | | Removes unused store in diffs mr refactorFilipa Lacerda2018-07-095-66/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes double export for actions in diffs module in mr refactor
* | | | | | | | | | Merge branch 'winh-fix-frontend-link-docs' into 'master'rails5-masterAnnabel Gray2018-07-091-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to frontend in handbook See merge request gitlab-org/gitlab-ce!20504
| * | | | | | | | | | Fix link to frontend in handbookWinnie Hellmann2018-07-091-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'sh-shorten-filenames-changelog' into 'master'Felipe Artur2018-07-091-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten CHANGELOG filename to avoid breaking ecryptfs users Closes #49038 See merge request gitlab-org/gitlab-ce!20512
| * | | | | | | | | | Shorten CHANGELOG filename to avoid breaking ecryptfs usersStan Hu2018-07-091-0/+0
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #49038
* | | | | | | | | | Replace ↵Felipe Artur2018-07-090-0/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
* | | | | | | | | Merge branch 'minor-update-ssh-key-docs' into 'master'Achilleas Pipinellis (🌴 July 10 - July 20 🌴)2018-07-091-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional headline for Adding SSH keys to GitLab Closes #46395 See merge request gitlab-org/gitlab-ce!20507
| * | | | | | | | Add additional headline for Adding SSH keys to GitLabAndreas Kämmerle2018-07-091-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'winh-waiting-in-tests-docs' into 'master'Tim Zallmann2018-07-091-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Document that we don't want to wait in tests See merge request gitlab-org/gitlab-ce!20502
| * | | | | | | | Document that we don't want to wait in testswinh-waiting-in-testsWinnie Hellmann2018-07-091-0/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'od/41671' into 'master'Mike Greiling2018-07-093-1/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve the correct start/due dates on milestones when editing Closes #41671 See merge request gitlab-org/gitlab-ce!20279
| * | | | | | | | save current date before Pikaday initOrlando Del Aguila2018-06-293-1/+30
| | | | | | | | |
* | | | | | | | | Merge branch 'update-rubocop'Sean McGivern2018-07-09220-493/+459
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove useless returnLin Jen-Shin2018-07-091-1/+1
| | | | | | | | | |
| * | | | | | | | | Use latest gitlab-stylesLin Jen-Shin2018-07-093-10/+4
| | | | | | | | | |
| * | | | | | | | | Resolve Naming/UncommunicativeMethodLin Jen-Shin2018-07-0926-156/+156
| | | | | | | | | |
| * | | | | | | | | Use stable gitlab-styles and eliminate offensesLin Jen-Shin2018-07-0914-35/+29
| | | | | | | | | |
| * | | | | | | | | Updates from `rubocop -a`Lin Jen-Shin2018-07-09188-309/+279
| | | | | | | | | |
| * | | | | | | | | Update rubocop to get rid of a warning in other MRLin Jen-Shin2018-07-095-24/+32
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dz-remote-badges-from-readme' into 'master'Rémy Coutable2018-07-091-6/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove badges from README.md in favor of GitLab badges feature Closes #48895 See merge request gitlab-org/gitlab-ce!20447
| * | | | | | | | | Remove badges from README.md in favor of GitLab badges featureDmitriy Zaporozhets2018-07-061-6/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2018-07-091-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Request to be a proofreader. See merge request gitlab-org/gitlab-ce!19423
| * | | | | | | | | | Request to be a proofreader.Yi-Jyun Pan2018-07-091-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master'Rémy Coutable2018-07-092-3/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 mysql fix milliseconds problem in pull request importer spec See merge request gitlab-org/gitlab-ce!20475
| * | | | | | | | | | Rails5 mysql fix milliseconds problem in pull request importer specJasper Maes2018-07-082-3/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'gitaly-update-branch' into 'master'Robert Speicher2018-07-093-1/+64
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly's OperationService.UserUpdateBranch RPC Closes gitaly#1252 See merge request gitlab-org/gitlab-ce!20231
| * | | | | | | | | | | Use Gitaly's OperationService.UserUpdateBranch RPCAlejandro Rodríguez2018-07-083-1/+64
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'use-correct-script-location' into 'master'Rémy Coutable2018-07-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the correct script location for the build trigger script See merge request gitlab-org/gitlab-ce!20454
| * | | | | | | | | | | | Use the correct script location for the build trigger scriptDJ Mountney2018-07-061-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'upgrade-hamlit-for-ruby25' into 'master'Rémy Coutable2018-07-095-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045 Closes #42045 See merge request gitlab-org/gitlab-ce!20315
| * | | | | | | | | | | | | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045Matthew Dawson2018-07-085-12/+17
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the hook logs to escape the contents properly, as the :plain filter does not do html escaping.
* | | | | | | | | | | | | Merge branch 'fix-search-bar' into 'master'Mike Greiling2018-07-092-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix search bar text input alignment Closes #48288 See merge request gitlab-org/gitlab-ce!20155
| * | | | | | | | | | | | | Fix search bar text input alignmentClement Ho2018-07-092-1/+9
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rails5-fix-48977' into 'master'Rémy Coutable2018-07-093-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix mysql milliseconds problem in specs Closes #48977 See merge request gitlab-org/gitlab-ce!20464
| * | | | | | | | | | | | | Rails5 fix mysql milliseconds problem in specsJasper Maes2018-07-073-3/+18
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rails5-update-gemfile-lock' into 'master'Rémy Coutable2018-07-092-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Gemfile.rails5.lock with latest Gemfile.lock changes See merge request gitlab-org/gitlab-ce!20466
| * | | | | | | | | | | | | Update Gemfile.rails5.lock with latest Gemfile.lock changesJasper Maes2018-07-072-5/+10
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch ↵Sean McGivern2018-07-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-rendered' into 'master' Resolve "Markdown help incorrect in how wiki pages are rendered" Closes #48970 See merge request gitlab-org/gitlab-ce!20459
| * | | | | | | | | | | | specify that wiki pags are rendered with RedcarpetBrett Walker2018-07-061-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs-clarify-pages-domain' into 'master'Achilleas Pipinellis (🌴 July 10 - July 20 🌴)2018-07-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: make it clear that you need a completely separate domain for Pages Closes #31961 See merge request gitlab-org/gitlab-ce!20369