summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Vue-i18n: app/assets/javascripts/clusters/ directoryEzekiel Kigbo2019-07-024-9/+20
| | | | | i18n linting for .vue files under the app/assets/javascripts/clusters/ directory
* Merge branch 'private-registry-docs' into 'master'Evan Read2019-07-011-30/+75
|\ | | | | | | | | | | | | Expand docs on configuring jobs with private registry access Closes gitlab-runner#3963 See merge request gitlab-org/gitlab-ce!27231
| * Expand docs on configuring jobs with private registry accessRoss Vandegrift2019-07-011-30/+75
|/ | | | Fixes: https://gitlab.com/gitlab-org/gitlab-runner/issues/3963
* Merge branch '82-add-new-onboarding-to-flipper-a-b-testing' into 'master'Nick Thomas2019-07-013-0/+46
|\ | | | | | | | | Add new onboarding to flipper A/B testing See merge request gitlab-org/gitlab-ce!30125
| * Add A/B testing support to onboarding82-add-new-onboarding-to-flipper-a-b-testingAsh McKenzie2019-06-281-0/+1
| | | | | | | | | | Check if we're gitlab.com and the :user_onboarding feature flag is enabled.
| * Add new OnboardingExperimentHelper modulesAsh McKenzie2019-06-282-0/+45
| | | | | | | | | | | | OnboardingExperimentHelpers take care of determining if the current_user should or should not see the new onboarding feature.
* | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Clement Ho2019-07-012-5/+5
|\ \ | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.66.0 See merge request gitlab-org/gitlab-ce!30193
| * | Update dependency @gitlab/svgs to ^1.66.0Lukas Eipert2019-06-282-5/+5
| | |
* | | Merge branch 'vue-i18n-js-environments-directory' into 'master'Clement Ho2019-07-015-8/+24
|\ \ \ | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/environments directory See merge request gitlab-org/gitlab-ce!29966
| * | | Vue-i18n: app/assets/javascripts/environments directoryEzekiel Kigbo2019-07-015-8/+24
|/ / / | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/environments directory
* | | Merge branch 'add-strategies-column-to-scopes-table' into 'master'Andreas Brandl2019-07-013-1/+24
|\ \ \ | | | | | | | | | | | | | | | | Add Migration for Strategies Column on operations_feature_flag_scopes See merge request gitlab-org/gitlab-ce!29808
| * | | Add Migration for Strategies Column on operations_feature_flag_scopesJason Goodman2019-07-013-1/+24
|/ / /
* | | Merge branch 'docs-fix-typo-in-docs' into 'master'Stan Hu2019-07-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix a typo in lib/gitlab/search/found_blob.rb See merge request gitlab-org/gitlab-ce!30219
| * | | Fix a typo in lib/gitlab/search/found_blob.rbdocs-fix-typo-in-docsRémy Coutable2019-07-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '9491-graphql-view-design-board-at-version-ce' into 'master'Nick Thomas2019-07-012-0/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE backport for "Show design boards at previous versions in GraphQL" See merge request gitlab-org/gitlab-ce!30151
| * | | | CE backport for changes in EE MR 142929491-graphql-view-design-board-at-version-ceLuke Duncalfe2019-06-282-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14292 https://gitlab.com/gitlab-org/gitlab-ee/issues/9491
* | | | | Merge branch '63590-pipeline-actions-cause-full-refresh' into 'master'Phil Hughes2019-07-015-10/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pipeline actions cause full refresh" Closes #63590 See merge request gitlab-org/gitlab-ce!30190
| * | | | | Fix pipelines table update after action63590-pipeline-actions-cause-full-refreshshampton2019-06-285-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pipelines table was showing the loading icon after the user cancelled or retried a pipeline. This fixes that so the pipeline updates without removing the table from the DOM.
* | | | | | Merge branch 'db-fixtures' into 'master'Sean McGivern2019-07-011-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | db.fixtures: use print instead of puts See merge request gitlab-org/gitlab-ce!30134
| * | | | | | db.fixtures: use print instead of putseyjhbb@gmail.com2019-06-271-2/+2
| | | | | | |
* | | | | | | Merge branch 'mh/board-tooltips' into 'master'Mike Greiling2019-07-012-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show tooltips on Open and Closed boards Closes #63890 See merge request gitlab-org/gitlab-ce!30187
| * | | | | | | Don't show tooltips on Open and Closed boardsMartin Hanzel2019-07-012-2/+9
|/ / / / / / /
* | | | | | | Merge branch 'feature/uninstall_jupyter_hub_app' into 'master'Mayra Cabrera2019-07-016-9/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow JupyterHub to be uninstalled See merge request gitlab-org/gitlab-ce!30097
| * | | | | | | Allow JupyterHub to be uninstalledJoão Cunha2019-07-016-9/+13
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - enabled uninstallation - give it a specific uninstall message - ajust specs
* | | | | | | Merge branch '50228-deploy-tokens-custom-username-docs' into 'master'Marcia Ramos2019-07-012-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Deploy Tokens documentation See merge request gitlab-org/gitlab-ce!29737
| * | | | | | | Update Deploy Tokens documentationKrasimir Angelov2019-07-012-1/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Update screenshot, add Deploy Token Custom Username section
* | | | | | | Merge branch 'puma-init-restart' into 'master'Kamil Trzciński2019-07-014-8/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cleanup of prometheus files on server start Closes #62862 See merge request gitlab-org/gitlab-ce!29788
| * | | | | | | Run do_master_restart callback on server startJan Provaznik2019-07-014-8/+42
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to call master_restart callback on start too - this callback is used for cleaning up prometheus files. It has been added to Omnibus already: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3350 So make sure that Unicorn example configs are up-to-date and that the same callback is called for Puma too.
* | | | | | | Merge branch '62722-boot-app-in-ci-and-check-memory-ce' into 'master'Kamil Trzciński2019-07-014-5/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get memory data after booting app in production Closes #62722 See merge request gitlab-org/gitlab-ce!30185
| * | | | | | | Get memory data after booting app in production62722-boot-app-in-ci-and-check-memory-ceAleksei Lipniagov2019-06-284-5/+41
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preload the app in `production` env, hit it with a single request, and gather total gem memory consumption data using `derailed exec perf:mem` from `derailed_benchmarks`. Present the result as MR metrics.
* | | | | | | Merge branch 'update-sidekiq-inline-testing-docs' into 'master'Rémy Coutable2019-07-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change docs to recommend perform_enqueued_jobs instead of Sidekiq::Testing.inline! See merge request gitlab-org/gitlab-ce!29845
| * | | | | | | Change docs to recommend perform_enqueued_jobsupdate-sidekiq-inline-testing-docsrpereira22019-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Instead of Sidekiq::Testing.inline!, recommend the use of perform_enqueued_jobs. This is due to the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20768
* | | | | | | | Merge branch 'divergence-graph-api-call' into 'master'Filipa Lacerda2019-07-016-25/+83
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch branches divergence graph data through API call Closes #46139 See merge request gitlab-org/gitlab-ce!30068
| * | | | | | | | Fetch branch diverging counts from APIPhil Hughes2019-07-016-25/+83
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46139
* | | | | | | | Merge branch 'no-security-scan-for-docs-branches' into 'master'Kamil Trzciński2019-07-016-55/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No security scan for docs branches See merge request gitlab-org/gitlab-ce!30137
| * | | | | | | | Refactor except codePhilippe Lafoucrière2019-07-016-55/+61
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We repeat the same code in many places. With the support of multiple extends, we can clean up several jobs.
* | | | | | | | Merge branch 'pl-qa-shell-flush-buffer' into 'master'Ramya Authappan2019-07-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Make shellout more responsive See merge request gitlab-org/gitlab-ce!29798
| * | | | | | | | QA: Make shellout more responsivePeter Leitzen2019-07-011-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid line-buffering and flush each character during shellout. This useful for commands (e.g. gcloud) which display its progress by printing single dots.
* | | | | | | | Merge branch 'vue-i18n-js-pipelines-directory' into 'master'Kushal Pandya2019-07-013-4/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/pipelines directory See merge request gitlab-org/gitlab-ce!30015
| * | | | | | | | Vue-i18n: app/assets/javascripts/pipelines directoryvue-i18n-js-pipelines-directoryEzekiel Kigbo2019-07-013-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/pipelines directory
* | | | | | | | | Merge branch 'vue-i18n-js-pages-directory' into 'master'Kushal Pandya2019-07-014-9/+54
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/pages directory See merge request gitlab-org/gitlab-ce!29978
| * | | | | | | | | Moved feature access arrays to constantsvue-i18n-js-pages-directoryEzekiel Kigbo2019-07-013-7/+41
| | | | | | | | | |
| * | | | | | | | | Vue-i18n: app/assets/javascripts/pages directoryEzekiel Kigbo2019-07-013-7/+18
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/pages directory
* | | | | | | | | Merge branch 'test_schema_version_check_directly' into 'master'Robert Speicher2019-07-011-7/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test schema_version_check directly Closes #63913 See merge request gitlab-org/gitlab-ce!30209
| * | | | | | | | | Test schema_version_check directlytest_schema_version_check_directlyThong Kuah2019-07-011-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing via db:migrate causes side-effects like setting ActiveRecord::Base.configurations and also it runs schema dump into db/schema.rb. Rather than keep up, we test schema_version_check directly
* | | | | | | | | | Merge branch 'update-default_value_for-to-3-2-0' into 'master'Nick Thomas2019-07-012-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the 'default_value_for' gem to 3.2.0 Closes default_value_for#1 See merge request gitlab-org/gitlab-ce!30173
| * | | | | | | | | | Update the 'default_value_for' gem to 3.2.0update-default_value_for-to-3-2-0Rémy Coutable2019-07-012-4/+4
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'move-colon-on-merge-request-notification' into 'master'Douwe Maan2019-07-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move colon on merge request notification See merge request gitlab-org/gitlab-ce!30178
| * | | | | | | | | | Move colon on merge request notificationGeorge Tsiolis2019-07-011-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-fix-issue-63910' into 'master'Sean McGivern2019-07-013-3/+45
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix attachments using the wrong URLs in e-mails Closes #63910 See merge request gitlab-org/gitlab-ce!30197