summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Testtry-to-enable-merge-request-pipelines-none-changesKamil Trzciński2019-04-150-0/+0
|
* Use merge-requestsKamil Trzciński2019-04-158-11/+11
|
* Run, always when .gitlab-ci is changedKamil Trzciński2019-04-153-0/+12
|
* Try to use Merge Request PipelinesKamil Trzciński2019-04-1510-138/+140
|
* 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
* | | | | | Merge branch 'ce-issue_6538' into 'master'Robert Speicher2019-04-152-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Extract EE specific files/lines for spec/features/issues See merge request gitlab-org/gitlab-ce!26740
| * | | | | | Extract EE specific files/lines for spec/features/issuesFelipe Artur2019-04-152-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | Part of moving gitlab into single codebase
* | | | | | Merge branch 'bvl-new-translations-ce' into 'master'Rémy Coutable2019-04-1545-11268/+126401
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add translations from Crowdin See merge request gitlab-org/gitlab-ce!27347
| * | | | | | Add translations from CrowdinGitLab Crowdin Bot2019-04-1345-11268/+126401
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '59873-page-title' into 'master'Phil Hughes2019-04-1511-13/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes stylelint for page_title.scss Closes #59873 See merge request gitlab-org/gitlab-ce!27315
| * | | | | Fixes stylelint for page_title.scss59873-page-titleFilipa Lacerda2019-04-1211-13/+10
| | |_|_|/ | |/| | | | | | | | | | | | | Replaces CSS with BS4 Utility classes
* | | | | Merge branch 'frozen-string-spec-some' into 'master'Rémy Coutable2019-04-15154-4/+313
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add some frozen string to spec/**/*.rb See merge request gitlab-org/gitlab-ce!27341
| * | | | | Add some frozen string to spec/**/*.rbgfyoung2019-04-15154-4/+313
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds frozen string to the following: * spec/bin/**/*.rb * spec/config/**/*.rb * spec/controllers/**/*.rb xref https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* | | | | Merge branch 'image-comment-reviews-ce' into 'master'Filipa Lacerda2019-04-155-11/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE backport of image-comment-reviews See merge request gitlab-org/gitlab-ce!27271
| * | | | | CE backport of image-comment-reviewsPhil Hughes2019-04-125-11/+39
| | | | | |
* | | | | | Merge branch '10921-display-scoped-labels-ce' into 'master'Kushal Pandya2019-04-1513-24/+181
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display scoped labels in Issue Boards See merge request gitlab-org/gitlab-ce!27164
| * | | | | | Display scoped labels in Issue BoardsRajat Jain2019-04-1513-24/+181
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This change brings new Scoped labels to Issue board as well. With the last change, this was missed.
* | | | | | Merge branch '17014-remove-rails-deprecated_sanitizer' into 'master'Douwe Maan2019-04-155-11/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove rails-deprecated_sanitizer" Closes #17014 See merge request gitlab-org/gitlab-ce!27268
| * | | | | | Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizerDmitriy Zaporozhets2019-04-125-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'sh-disable-postgresql-fsync-ci' into 'master'Kamil Trzciński2019-04-151-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable PostgreSQL fsync for faster CI Closes #60435 See merge request gitlab-org/gitlab-ce!27295
| * | | | | | | Turn off database durability settings in CIsh-disable-postgresql-fsync-ciStan Hu2019-04-121-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in https://www.postgresql.org/docs/current/non-durability.html, we can save money and time by disabling durability in tests.
* | | | | | | | Merge branch '60480-rescue-build-preparing-errors' into 'master'Kamil Trzciński2019-04-152-4/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rescue and log errors raised when preparing builds Closes #60480 See merge request gitlab-org/gitlab-ce!27351
| * | | | | | | | Rescue and log errors raised when preparing builds60480-rescue-build-preparing-errorsTiger2019-04-152-4/+20
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/60480
* | | | | | | | Merge branch 'frozen_string_literal_qa' into 'master'Sanad Liaquat2019-04-1598-1/+198
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to qa/ See merge request gitlab-org/gitlab-ce!27266
| * | | | | | | Add frozen_string_literal to qa/frozen_string_literal_qaThong Kuah2019-04-1398-1/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be default in Ruby 3, so will be good to apply in QA ahead of time to be consistent.
* | | | | | | | Merge branch '31331-add-time-tracking-issue-boards-sidebar' into 'master'Tim Zallmann2019-04-127-13/+63
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add time tracking information to Issue Boards sidebar Closes #31331 See merge request gitlab-org/gitlab-ce!27166