summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Address comments.7453_document_security_and_licence_management_featuresçpermissions-docsGilbert Roulot2018-10-011-76/+76
| | | | Add the GitLab Ultimate badge. tidy the table source.
* Add sec dashboard, license mngmt and vuln feedback to permission docGilbert Roulot2018-10-011-0/+7
| | | | | Add security dashboard, license management and vulnerability feedback to the user permission page.
* Merge branch 'update-link-to-documentation-testing' into 'master'Achilleas Pipinellis2018-10-011-1/+1
|\ | | | | | | | | Update link to documentation testing See merge request gitlab-org/gitlab-ce!22018
| * Update link to documentation testingFabio Busatto2018-10-011-1/+1
| |
* | Merge branch 'be-more-agressive-cleaning-up-review-apps' into 'master'Marin Jankovski2018-10-011-2/+2
|\ \ | | | | | | | | | | | | Cleanup review apps more rapidly See merge request gitlab-org/gitlab-ce!22019
| * | Cleanup review apps more rapidlyRémy Coutable2018-10-011-2/+2
| |/ | | | | | | | | | | | | | | - Stop review app's environment after 2 days - Delete review app's environment after 3 days - Delete Helm release after 4 days Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-fix-issue-52009' into 'master'Sean McGivern2018-10-013-1/+15
|\ \ | | | | | | | | | | | | | | | | | | Prevent Error 500s with invalid relative links Closes #52009 See merge request gitlab-org/gitlab-ce!22001
| * | Prevent Error 500s with invalid relative linksStan Hu2018-09-293-1/+15
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/52009
* | | Merge branch '51476-private-profile-help-url-should-not-toggle-checkbox' ↵Annabel Dunstone Gray2018-10-013-3/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Private profile help url should not toggle checkbox" Closes #51476 See merge request gitlab-org/gitlab-ce!21757
| * | | Resolve "Private profile help url should not toggle checkbox"Martin Wortschack2018-10-013-3/+19
|/ / /
* | | Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'Nick Thomas2018-10-0110-18/+111
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds list_last_commits_for_tree as the method call for the Gitaly ListLastCommitsForTree RPC Closes #37433 See merge request gitlab-org/gitlab-ce!21921
| * | | Removes N+1 gitaly rpc call to fetch the last commit for pathTiago Botelho2018-10-0110-18/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements list_last_commits_for_tree to communicate with the ListLastCommitsForTree Gitaly RPC Bumps the Gitaly server version Bumps the Gitaly-Proto gem version
* | | | Merge branch 'ide-keep-right-pane-tabs-alive' into 'master'Phil Hughes2018-10-0124-62/+345
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Keep IDE RightPane views alive See merge request gitlab-org/gitlab-ce!21980
| * | | | Keep IDE RightPane views aliveide-keep-right-pane-tabs-alivePaul Slaughter2018-09-2824-62/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** - This is needed for the Web Terminal feature. https://gitlab.com/gitlab-org/gitlab-ee/issues/5426 **Notes:** - Introduces a `pane` Vuex module. - Some views should not be kept alive (i.e. job details). This is why a `keepAlive` flag was introduced for views.
* | | | | Merge branch ↵Phil Hughes2018-10-012-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '#48445-Issue-card-in-board-view-is-too-sensitive-to-drag-event' into 'master' Fix link handling for issue cards. Closes #48445 See merge request gitlab-org/gitlab-ce!21910
| * | | | | add changelog entryJohann Hubert Sonntagbauer2018-09-291-0/+5
| | | | | |
| * | | | | Fix link handling for issue cards.Johann Hubert Sonntagbauer2018-09-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The header link will now stop event propagation, so that clicking is much simpler. On Windows and Chrome, the link worked 1 out of 5 times because drag operation was immediately fired.
* | | | | | Merge branch 'frozen-string-docs' into 'master'Rémy Coutable2018-10-012-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs regarding frozen string See merge request gitlab-org/gitlab-ce!22003
| * | | | | | Update docs regarding frozen stringgfyoung2018-09-292-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | xref #47424.
* | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2018-10-011-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: clarify nothing special required for post-deployment migrations See merge request gitlab-org/gitlab-ce!22000
| * | | | | | | docs: clarify nothing special required for post-deployment migrationsBen Bodenmiller2018-09-281-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'bvl-remove-sha-from-help' into 'master'Douwe Maan2018-10-013-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to the tag from a version instead of commit Closes gitlab-org/release/tasks#459 See merge request gitlab-org/gitlab-ce!22015
| * | | | | | | Link to the tag from a version instead of commitBob Van Landuyt2018-10-013-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will result in a 404 when running an unreleased security patch while still allowing users to find the commit when it is made available.
* | | | | | | | Merge branch 'sh-fix-forks-with-no-gravatar' into 'master'Rémy Coutable2018-10-016-40/+28
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when forking projects with Gravatar disabled Closes #50254 See merge request gitlab-org/gitlab-ce!21985
| * | | | | | | Fix Error 500 when forking projects with Gravatar disabledsh-fix-forks-with-no-gravatarStan Hu2018-09-286-40/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Gravatar is disabled, the "no avatar" is used, which failed to revert to the colorful identity icons for namespaces. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50254
* | | | | | | | Merge branch 'dz-fix-mysql-schema' into 'master'Dmitriy Zaporozhets2018-10-011-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined format_options method in SchemaDumper for MySQL db See merge request gitlab-org/gitlab-ce!21907
| * | | | | | | | Fix undefined format_options method in SchemaDumper for MySQL dbdz-fix-mysql-schemaDmitriy Zaporozhets2018-09-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch '48399-skip-auto-devops-jobs-based-on-license' into 'master'Dmitriy Zaporozhets2018-10-012-3/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip creating auto devops jobs for sast, container_scanning, dast,… See merge request gitlab-org/gitlab-ce!21959
| * | | | | | | | | Skip creating auto devops jobs for sast, container_scanning, dast, ↵48399-skip-auto-devops-jobs-based-on-licenseDylan Griffith2018-09-272-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency_scanning when not licensed
* | | | | | | | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-10-011-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notes about commits API to repository files documentation See merge request gitlab-org/gitlab-ce!21876
| * | | | | | | | | | Add notes about commits API to repository files documentationKaspar Emanuel2018-09-271-0/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'remove-dropzonejs-rails' into 'master'Douwe Maan2018-10-015-11/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dropzonejs-rails (replaced by dropzone node module) See merge request gitlab-org/gitlab-ce!17831
| * | | | | | | | | | Update Gemfile.lockMike Greiling2018-09-281-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Update rails 5 Gemfile.lockMike Greiling2018-09-281-3/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into 'remove-dropzonejs-rails'Mike Greiling2018-09-289202-142413/+461825
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile.lock
| * | | | | | | | | | | use yarn installed dropzonePirate Praveen2018-03-201-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Remove dropzonejs-rails (replaced by dropzone node module)Pirate Praveen2018-03-203-7/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ide-fetch-templates-pages' into 'master'Filipa Lacerda2018-10-014-8/+60
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed file templates not being fully fetched in Web IDE Closes #51912 See merge request gitlab-org/gitlab-ce!21993
| * | | | | | | | | | | | Fixed file templates not being fully fetched in Web IDEPhil Hughes2018-09-284-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #51912
* | | | | | | | | | | | | Merge branch '51651-fill-pipeline-source-for-external-pipelines' into 'master'Kamil Trzciński2018-09-306-0/+171
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fill pipeline source for external pipelines" Closes #51651 See merge request gitlab-org/gitlab-ce!21814
| * | | | | | | | | | | | Reorganize background_migration specs51651-fill-pipeline-source-for-external-pipelinesMatija Čupić2018-09-291-19/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds specs for 3 distinct situations: 2. When there is an unknown pipeline with just a build 3. When there is an unknown pipeline with no statuses 1. When there is an unknown pipeline with a build and a status
| * | | | | | | | | | | | Refactor pipeline id orderingMatija Čupić2018-09-281-1/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Restyle background_migration specMatija Čupić2018-09-281-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Refactor migration specs using ActiveRecord modelsMatija Čupić2018-09-282-13/+18
| | | | | | | | | | | | |
| * | | | | | | | | | | | Refactor external_pipelines queryMatija Čupić2018-09-272-9/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update all pipelines in single queryMatija Čupić2018-09-271-3/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add frozen string literal commentMatija Čupić2018-09-251-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add CHANGELOG entryMatija Čupić2018-09-251-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Schedule background migrationMatija Čupić2018-09-251-0/+33
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add background migration to fill pipeline sourceMatija Čupić2018-09-252-0/+89
| | | | | | | | | | | | |