summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'winh-boards-store' into 'master'Phil Hughes2019-04-162-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove EE-specific code from boards store (CE-backport) See merge request gitlab-org/gitlab-ce!26924
| * | | | | | | | | | | | Copy boards store changes from EEwinh-boards-storeWinnie Hellmann2019-04-101-1/+11
| | | | | | | | | | | | |
| * | | | | | | | | | | | Import BoardsStoreEE conditionallyWinnie Hellmann2019-04-102-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d79e06149136f01d2a3fce328791bcf70d31c0df)
* | | | | | | | | | | | | Merge branch 'mw-i18n-quick-actions' into 'master'Dmitriy Zaporozhets2019-04-165-57/+222
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in lib/gitlab/quick_actions See merge request gitlab-org/gitlab-ce!27369
| * | | | | | | | | | | | Externalize strings in lib/gitlab/quick_actionsmw-i18n-quick-actionsMartin Wortschack2019-04-155-57/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Externalize strings for desc and explanation - Update PO file
* | | | | | | | | | | | | Merge branch 'ce-4681-autosave' into 'master'Kushal Pandya2019-04-169-4/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autosave description in epics See merge request gitlab-org/gitlab-ce!27296
| * | | | | | | | | | | | | Autosave description in epicsRajat Jain2019-04-169-4/+150
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When editing an epic, the progress was previously lost due to lack of localstorage syncing code. This commit adds support for localstorage sync.
* | | | | | | | | | | | | Merge branch 'bw-query_graphql_field-enhancement' into 'master'Dmitriy Zaporozhets2019-04-162-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow arrays to be specified for fields in graphql_query_for Closes #60238 See merge request gitlab-org/gitlab-ce!27142
| * | | | | | | | | | | | | Allow arrays to specify fields graphql_query_forbw-query_graphql_field-enhancementBrett Walker2019-04-112-2/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'helm_uninstall_command' into 'master'Sean McGivern2019-04-164-0/+161
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helm DeleteCommand See merge request gitlab-org/gitlab-ce!27348
| * | | | | | | | | | | | | | Implement commands to uninstall cluster applicationshelm_uninstall_commandThong Kuah2019-04-164-0/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the backend part which just allows uninstalling Prometheus for now.
* | | | | | | | | | | | | | | Merge branch 'jramsay/notes-api-pagination-docs' into 'master'Achilleas Pipinellis2019-04-162-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pagination to notes and discussions docs Closes #51616 See merge request gitlab-org/gitlab-ce!27401
| * | | | | | | | | | | | | | | Add pagination to notes and discussions docsJames Ramsay2019-04-152-0/+14
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ci-lint-ssl-error' into 'master'Kamil Trzciński2019-04-163-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reporting SSL certificate verify errors in CI external config See merge request gitlab-org/gitlab-ce!26750
| * | | | | | | | | | | | | | | catching and cleanly reporting SSL errors in Ci::Config::External::Processordrew cimino2019-04-153-1/+30
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'docs-move-content-from-handbook-and-improve' into 'master'60556-docs-feedback-remove-specific-cntlm-proxy-example-definitionsAchilleas Pipinellis2019-04-162-123/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Development docs: move some docs content from Handbook and improve content/headings See merge request gitlab-org/gitlab-ce!27399
| * | | | | | | | | | | | | | | Development docs: move some docs content from Handbook and improve ↵Mike Lewis2019-04-162-123/+132
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content/headings
* | | | | | | | | | | | | | | Merge branch '60026-group-member-count-bg' into 'master'Fatih Acet2019-04-152-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add badge-pill class on group member count Closes #60026 See merge request gitlab-org/gitlab-ce!27019
| * | | | | | | | | | | | | | | Add badge-pill class on group member count60026-group-member-count-bgPaul Gascou-Vaillancourt2019-04-122-1/+6
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Fatih Acet2019-04-152-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.3.0 See merge request gitlab-org/gitlab-ce!27321
| * | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.3.0Lukas 'Eipi' Eipert2019-04-122-5/+5
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'docs/restructure-review-apps-docs' into 'master'Mike Lewis2019-04-152-99/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor review apps doco and CI landing page See merge request gitlab-org/gitlab-ce!26886
| * | | | | | | | | | | | | | | | | Refactor review apps doco and CI landing pageEvan Read2019-04-152-99/+62
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'sh-fix-merge-requests-api-remove-branch-param' into 'master'Michael Kozono2019-04-154-2/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix remove_source_branch merge request API handling Closes #60530 See merge request gitlab-org/gitlab-ce!27392
| * | | | | | | | | | | | | | | | Fix remove_source_branch merge request API handlingsh-fix-merge-requests-api-remove-branch-paramStan Hu2019-04-154-2/+33
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users attempting to set merge requests to `remove_source_branch` to `false` would encounter an Error 500 because the UpdateService and API checked `present?`, which would always return `false`. We now just use `has_key?` to decide whether the parameter is present. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60530
* | | | | | | | | | | | | | | | Merge branch 'docs/fix-external-link-404' into 'master'Achilleas Pipinellis2019-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix URL that causes test_external_links to fail See merge request gitlab-org/gitlab-ce!27384
| * | | | | | | | | | | | | | | | Fix URL that causes test_external_links to failAchilleas Pipinellis2019-04-151-1/+1
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-com/gitlab-docs/-/jobs/196921364
* | | | | | | | | | | | | | | | Merge branch 'sh-fix-pipeline-delete-caching' into 'master'Lin Jen-Shin2019-04-156-78/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly expire all pipeline caches when pipeline is deleted Closes #60469 See merge request gitlab-org/gitlab-ce!27334
| * | | | | | | | | | | | | | | Properly expire all pipeline caches when pipeline is deletedsh-fix-pipeline-delete-cachingStan Hu2019-04-156-78/+134
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting a pipeline, only some of the cache structures were being expired, but not the full pipeline list. We have to synchronously schedule a pipeline cache expiration because the pipeline will be deleted if the Sidekiq expiration job picks it up. To do this, properly extract all the logic buried in the Sidekiq worker into a service, and then call the service. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60469
* | | | | | | | | | | | | | | Merge branch 'forbid-the-usage-of-reload' into 'master'Lin Jen-Shin2019-04-1524-26/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forbid the usage of reload Closes #60218 See merge request gitlab-org/gitlab-ce!27125
| * | | | | | | | | | | | | | | Forbid the use of `#reload` and prefer `#reset`forbid-the-usage-of-reloadKamil Trzciński2019-04-1524-26/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `#reload` makes to load all objects into memory, and the main purpose of `#reload` is to drop the association cache. The `#reset` seems to solve exactly that case.
* | | | | | | | | | | | | | | | Merge branch 'osw-remote-multi-line-suggestions-ff' into 'master'Lin Jen-Shin2019-04-152-35/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove multi-line suggestions feature flag Closes #59178 See merge request gitlab-org/gitlab-ce!27219
| * | | | | | | | | | | | | | | Remove multi-line suggestions feature flagosw-remote-multi-line-suggestions-ffOswaldo Ferreira2019-04-102-35/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's a straightforward feature flag code removal for 11.10
* | | | | | | | | | | | | | | | Merge branch 'zj-fsck-no-timeout' into 'master'Nick Thomas2019-04-152-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git FSCK has no timeout Closes #53319 See merge request gitlab-org/gitlab-ce!27299
| * | | | | | | | | | | | | | | | Git FSCK has no timeoutzj-fsck-no-timeoutZeger-Jan van de Weg2019-04-152-1/+6
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FSCK is usually called through sidekiq, but a rake task doesn't have a mechanism to default to no timeout for this RPC. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53319
* | | | | | | | | | | | | | | | Merge branch 'prometheus-api-var-subst' into 'master'Sean McGivern2019-04-152-3/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add variable substitution in prometheus proxy API See merge request gitlab-org/gitlab-ce!27226
| * | | | | | | | | | | | | | | Add ability to do variable substitutionReuben Pereira2019-04-152-3/+59
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In prometheus proxy api, allow variables to be replaced. For example, if 'up{env="%{ci_environment_slug}"}' is passed to the endpoint, it becomes 'up{env="production"}' before being sent to prometheus.
* | | | | | | | | | | | | | | Merge branch 'refactor-gitlab-ci-yml' into 'master'Rémy Coutable2019-04-1512-1150/+1159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split `.gitlab-ci.yml` into multiple includes Closes #58521 See merge request gitlab-org/gitlab-ce!27116
| * | | | | | | | | | | | | | | Refactor .gitlab-ci.ymlKamil Trzciński2019-04-1512-1150/+1159
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sh-validate-ref-name-in-commit' into 'master'Rémy Coutable2019-04-154-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate refs used in controllers don't have spaces Closes #58572 and gitaly#1425 See merge request gitlab-org/gitlab-ce!24037
| * | | | | | | | | | | | | | | | Validate refs used in controllers don't have spacessh-validate-ref-name-in-commitStan Hu2019-04-144-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids an unnecessary call to Gitaly and reduces gRPC errors. * Closes https://gitlab.com/gitlab-org/gitaly/issues/1425 * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58572
* | | | | | | | | | | | | | | | | Merge branch 'feature/add_write_repository_scope' into 'master'James Lopez2019-04-1513-43/+152
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added write_repository scope for personal access token Closes #58847 and #51709 See merge request gitlab-org/gitlab-ce!26021
| * | | | | | | | | | | | | | | | | Added write_repository scope for personal access tokenHoratiu Eugen Vlad2019-04-1513-43/+152
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'docs-pages-intro-refactor' into 'master'Achilleas Pipinellis2019-04-151-43/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: reorg Pages index See merge request gitlab-org/gitlab-ce!27319
| * | | | | | | | | | | | | | | | | Docs: reorg Pages indexMarcia Ramos2019-04-151-43/+39
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'mw-i18n-app-helpers-services' into 'master'Lin Jen-Shin2019-04-1516-61/+213
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in app/services and app/helpers See merge request gitlab-org/gitlab-ce!27220
| * | | | | | | | | | | | | | | | | Externalize strings detected by rubocop-i18nMartin Wortschack2019-04-1516-61/+213
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Externalize strings in milestones_helper - Externalize strings in app/services - Update PO file
* | | | | | | | | | | | | | | | | Merge branch 'cherry-pick-39eb16aa' into 'master'Sean McGivern2019-04-1518-53/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick revert of `require-all-templates-to-include-default-stages' Closes #59992 and #60106 See merge request gitlab-org/gitlab-ce!27312
| * | | | | | | | | | | | | | | | Un-quarantine speccherry-pick-39eb16aaKamil Trzciński2019-04-151-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'require-all-templates-to-include-default-stages' into 'master'Sean McGivern2019-04-1518-50/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require all templates to use default stages Closes #59992 See merge request gitlab-org/gitlab-ce!26954 (cherry picked from commit 39eb16aab2dbac3347f61f83fb60f5448d44e965) e0df05cf Require all templates to use default stages