summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clarify how to update existing prometheus metricsdocs/improve-prometheus-metricsPeter Leitzen2019-01-161-1/+24
|
* Merge branch 'fix-403-page-is-rendered-but-404-is-the-response' into 'master'Lin Jen-Shin2019-01-164-4/+18
|\ | | | | | | | | | | | | Show the correct error page when access is denied Closes #55110 See merge request gitlab-org/gitlab-ce!23932
| * Show the correct error page when access is deniedLuke Bennett2019-01-154-4/+18
| |
* | Merge branch 'sh-fix-prettier-failures' into 'master'Kushal Pandya2019-01-161-1/+1
|\ \ | | | | | | | | | | | | Run prettier on squash_before_merge.vue See merge request gitlab-org/gitlab-ce!24413
| * | Run prettier on squash_before_merge.vueStan Hu2019-01-151-1/+1
|/ /
* | Merge branch 'mg-upgrade-prettier-again' into 'master'Clement Ho2019-01-1568-133/+124
|\ \ | | | | | | | | | | | | Upgrade prettier to v1.15.3 See merge request gitlab-org/gitlab-ce!24312
| * | Upgrade prettier and reformat files as necessaryMike Greiling2019-01-1468-133/+124
| |/ | | | | | | | | | | Upgrades prettier to 1.15.3 Runs `yarn prettier-save-all` against the codebase Most changes are due to https://github.com/prettier/prettier/pull/5519
* | Merge branch 'patch-37' into 'master'Fatih Acet2019-01-152-17/+53
|\ \ | | | | | | | | | | | | Externalize strings from `/app/views/profiles/accounts` See merge request gitlab-org/gitlab-ce!24095
| * | Externalize strings from `/app/views/profiles/accounts`André Gama2019-01-152-17/+53
|/ /
* | Merge branch 'allow-to-quarantine-tests' into 'master'Robert Speicher2019-01-154-4/+37
|\ \ | | | | | | | | | | | | Allow to quarantine tests See merge request gitlab-org/gitlab-ce!24369
| * | Add jobs to run quarantine testsRémy Coutable2019-01-152-1/+17
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Quarantine very flaky testsRémy Coutable2019-01-151-3/+3
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Allow to quarantine testsRémy Coutable2019-01-152-0/+17
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch ↵Nick Thomas2019-01-153-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55111-gitlab-api-does-not-manage-default_branch_protection-3-value' into 'master' API: Fix default branch protection setting for Admin API Closes #55111 See merge request gitlab-org/gitlab-ce!24398
| * | | API: Fix default branch protection setting for Admin APIRobert Schilling2019-01-153-2/+9
|/ / /
* | | Merge branch 'docs/uplift-branches-api-doc' into 'master'Achilleas Pipinellis2019-01-152-142/+83
|\ \ \ | | | | | | | | | | | | | | | | Add more information and refactor format of branch-related API topics See merge request gitlab-org/gitlab-ce!24290
| * | | Add more information and refactor format of branch-related API topicsEvan Read2019-01-152-142/+83
|/ / /
* | | Merge branch 'docs/uplift-avatar-api-doc' into 'master'Achilleas Pipinellis2019-01-151-15/+23
|\ \ \ | | | | | | | | | | | | | | | | Add more information and refactor format of Avatar API topic See merge request gitlab-org/gitlab-ce!24258
| * | | Add more information and refactor format of Avatar API topicEvan Read2019-01-151-15/+23
|/ / /
* | | Merge branch 'homepage-proj-descr-cutoff' into 'master'Annabel Dunstone Gray2019-01-152-2/+9
|\ \ \ | | | | | | | | | | | | | | | | Increase line height of project summaries See merge request gitlab-org/gitlab-ce!24341
| * | | Increase line height of project summariesgfyoung2019-01-142-2/+9
| | | | | | | | | | | | | | | | | | | | Taller letters like "g" were getting slightly cutoff before.
* | | | Merge branch 'twang2218/gitlab-ce-i18n-extract-app/views/search' into 'master'Lin Jen-Shin2019-01-1513-40/+95
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/search' See merge request gitlab-org/gitlab-ce!24297
| * | | | [i18n] Externalize strings from 'app/views/search'Tao Wang2019-01-1513-40/+95
| | |/ / | |/| | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch ↵Douwe Maan2019-01-154-4/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44780-wiki-page-with-a-dot-inside-title-slug-leads-to-404-in-the-api' into 'master' Support Wiki pages with dots in slugs Closes #44780 See merge request gitlab-org/gitlab-ce!24383
| * | | | API: Support dots in wiki slugsRobert Schilling2019-01-154-4/+11
| | |/ / | |/| |
* | | | Merge branch 'sh-suppress-duplicate-remote-mirror-notifications' into 'master'Douwe Maan2019-01-157-3/+91
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only send one notification for failed remote mirror Closes #56222 See merge request gitlab-org/gitlab-ce!24381
| * | | | Only send one notification for failed remote mirrorStan Hu2019-01-157-3/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retries in Sidekiq and in the remote mirror scheduler can cause repeated attempts in quick succession if the sync fails. Each failure will then send an e-mail to all project maintainers, which can spam users unnecessarily. Modify the logic to send one notification the first time the mirror fails by setting `error_notification_sent` to `true` and reset the flag after a successful sync. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56222
* | | | | Merge branch 'sh-fix-backfill-project-repo-migration' into 'master'Douwe Maan2019-01-154-6/+33
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate project disk path in BackfillLegacyProjectRepositories Closes #56061 See merge request gitlab-org/gitlab-ce!24213
| * | | | Cleanup dead code and commentsToon Claes2019-01-112-20/+5
| | | | |
| * | | | Fix failing spec with orphaned namespaceToon Claes2019-01-112-2/+2
| | | | |
| * | | | Load all projects, namespaces, routes in 1 queryToon Claes2019-01-112-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid doing sequential database queries to load the namespaces and the routes of projects and namespaces. This results in the following query: ```sql SELECT "projects"."id" AS t0_r0, "projects"."name" AS t0_r1, "projects"."path" AS t0_r2, "projects"."description" AS t0_r3, "projects"."created_at" AS t0_r4, "projects"."updated_at" AS t0_r5, "projects"."creator_id" AS t0_r6, "projects"."namespace_id" AS t0_r7, "projects"."last_activity_at" AS t0_r8, "projects"."import_url" AS t0_r9, "projects"."visibility_level" AS t0_r10, "projects"."archived" AS t0_r11, "projects"."avatar" AS t0_r12, "projects"."import_status" AS t0_r13, "projects"."star_count" AS t0_r14, "projects"."import_type" AS t0_r15, "projects"."import_source" AS t0_r16, "projects"."import_error" AS t0_r17, "projects"."ci_id" AS t0_r18, "projects"."shared_runners_enabled" AS t0_r19, "projects"."runners_token" AS t0_r20, "projects"."build_coverage_regex" AS t0_r21, "projects"."build_allow_git_fetch" AS t0_r22, "projects"."build_timeout" AS t0_r23, "projects"."pending_delete" AS t0_r24, "projects"."public_builds" AS t0_r25, "projects"."last_repository_check_failed" AS t0_r26, "projects"."last_repository_check_at" AS t0_r27, "projects"."container_registry_enabled" AS t0_r28, "projects"."only_allow_merge_if_pipeline_succeeds" AS t0_r29, "projects"."has_external_issue_tracker" AS t0_r30, "projects"."repository_storage" AS t0_r31, "projects"."request_access_enabled" AS t0_r32, "projects"."has_external_wiki" AS t0_r33, "projects"."ci_config_path" AS t0_r34, "projects"."lfs_enabled" AS t0_r35, "projects"."description_html" AS t0_r36, "projects"."only_allow_merge_if_all_discussions_are_resolved" AS t0_r37, "projects"."printing_merge_request_link_enabled" AS t0_r38, "projects"."auto_cancel_pending_pipelines" AS t0_r39, "projects"."import_jid" AS t0_r40, "projects"."cached_markdown_version" AS t0_r41, "projects"."delete_error" AS t0_r42, "projects"."last_repository_updated_at" AS t0_r43, "projects"."storage_version" AS t0_r44, "projects"."resolve_outdated_diff_discussions" AS t0_r45, "projects"."repository_read_only" AS t0_r46, "projects"."merge_requests_ff_only_enabled" AS t0_r47, "projects"."merge_requests_rebase_enabled" AS t0_r48, "projects"."jobs_cache_index" AS t0_r49, "projects"."pages_https_only" AS t0_r50, "projects"."remote_mirror_available_overridden" AS t0_r51, "projects"."pool_repository_id" AS t0_r52, "projects"."runners_token_encrypted" AS t0_r53, "projects"."bfg_object_map" AS t0_r54, "namespaces"."id" AS t1_r0, "namespaces"."name" AS t1_r1, "namespaces"."path" AS t1_r2, "namespaces"."owner_id" AS t1_r3, "namespaces"."created_at" AS t1_r4, "namespaces"."updated_at" AS t1_r5, "namespaces"."type" AS t1_r6, "namespaces"."description" AS t1_r7, "namespaces"."avatar" AS t1_r8, "namespaces"."share_with_group_lock" AS t1_r9, "namespaces"."visibility_level" AS t1_r10, "namespaces"."request_access_enabled" AS t1_r11, "namespaces"."description_html" AS t1_r12, "namespaces"."lfs_enabled" AS t1_r13, "namespaces"."parent_id" AS t1_r14, "namespaces"."require_two_factor_authentication" AS t1_r15, "namespaces"."two_factor_grace_period" AS t1_r16, "namespaces"."cached_markdown_version" AS t1_r17, "namespaces"."runners_token" AS t1_r18, "namespaces"."runners_token_encrypted" AS t1_r19, "routes"."id" AS t2_r0, "routes"."source_id" AS t2_r1, "routes"."source_type" AS t2_r2, "routes"."path" AS t2_r3, "routes"."created_at" AS t2_r4, "routes"."updated_at" AS t2_r5, "routes"."name" AS t2_r6, "routes_projects"."id" AS t3_r0, "routes_projects"."source_id" AS t3_r1, "routes_projects"."source_type" AS t3_r2, "routes_projects"."path" AS t3_r3, "routes_projects"."created_at" AS t3_r4, "routes_projects"."updated_at" AS t3_r5, "routes_projects"."name" AS t3_r6 FROM "projects" LEFT OUTER JOIN "namespaces" ON "namespaces"."id" = "projects"."namespace_id" LEFT OUTER JOIN "routes" ON "routes"."source_id" = "namespaces"."id" AND "routes"."source_type" = $1 LEFT OUTER JOIN "routes" "routes_projects" ON "routes_projects"."source_id" = "projects"."id" AND "routes_projects"."source_type" = $2 LEFT OUTER JOIN "project_repositories" ON "projects"."id" = "project_repositories"."project_id" WHERE ("projects"."storage_version" IS NULL OR "projects"."storage_version" = 0) AND "project_repositories"."project_id" IS NULL AND ("projects"."id" BETWEEN $3 AND $4); -- [["source_type", "Namespace"], -- ["source_type", "Project"], -- ["id", 1], -- ["id", 4]] ```
| * | | | Fix duplicate disk path in Backfill ProjectReposStan Hu2019-01-112-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On GitLab.com, we saw numerous duplicate disk entry inserts because the migration was not taking the routes table into account. We now implement this in the migration to be consistent. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56061
* | | | | Merge branch '55945-suggested-change-preview-highlight' into 'master'Kushal Pandya2019-01-1510-6/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add syntax highlighting to suggestion preview Closes #55945 See merge request gitlab-org/gitlab-ce!24358
| * | | | | Add syntax highlighting to suggestion previewJacques Erasmus2019-01-1510-6/+28
|/ / / / /
* | | | | Merge branch 'docs/guidance-for-four-backticks' into 'master'Achilleas Pipinellis2019-01-151-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document four backticks feature in markdown See merge request gitlab-org/gitlab-ce!24349
| * | | | | Document four backticks feature in markdownEvan Read2019-01-151-0/+6
|/ / / / /
* | | | | Merge branch 'sh-fix-project-mirrors-mix-http-ssh-creds-ce' into 'master'Nick Thomas2019-01-152-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add clear_credentials method to ProjectImportData See merge request gitlab-org/gitlab-ce!24373
| * | | | | Add clear_credentials method to ProjectImportDataStan Hu2019-01-142-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9134.
* | | | | | Merge branch 'tz-improve-navigation-initialisation' into 'master'Phil Hughes2019-01-153-38/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimization of setup of Main Nav Layout, Contextual Sidebar and Fly Out Nav Closes #56257 See merge request gitlab-org/gitlab-ce!24362
| * | | | | | Optimization of setup of Main Nav Layout, Contextual Sidebar and Fly Out NavTim Zallmann2019-01-153-38/+56
|/ / / / / /
* | | | | | Merge branch 'backstage/gb/refactor-only-except-policies-config' into 'master'Kamil Trzciński2019-01-1513-39/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor only/except configuration policies See merge request gitlab-org/gitlab-ce!24359
| * | | | | | Simplify code related to setting default config valuesGrzegorz Bizon2019-01-153-4/+6
| | | | | | |
| * | | | | | Make default config entry value configurableGrzegorz Bizon2019-01-1511-55/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce `default:` configuration entry setting that makes it possible to configure a default value of an entry, what overrides class-level `def self.default` value.
| * | | | | | Fix specs related to emtpy `except` policy configGrzegorz Bizon2019-01-143-10/+5
| | | | | | |
| * | | | | | Add more specs for only/except policy config entryGrzegorz Bizon2019-01-142-3/+51
| | | | | | |
| * | | | | | Make fabrication of default config entry more readableGrzegorz Bizon2019-01-142-5/+7
| | | | | | |
| * | | | | | Refactor only/except configuration policiesGrzegorz Bizon2019-01-1410-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit refactors only/except policies so that these policies could be self-contained. This also adds some changes to YAML configuration library to provide more context to default entry value fabrication process.
* | | | | | | Merge branch 'sh-fix-issue-55161' into 'master'Rémy Coutable2019-01-151-5/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing MySQL spec due to deadlock condition Closes #55161 See merge request gitlab-org/gitlab-ce!24378
| * | | | | | | Fix failing MySQL spec due to deadlock conditionStan Hu2019-01-141-5/+15
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `spec/features/uploads/user_uploads_file_to_note_spec.rb` was failing in master because MySQL detected a deadlock when a DELETE and INSERT for the same indexed item occurred within a transaction in the `uploads` table. Due to InnoDB's next-key locking algorithm (innodb_locks_unsafe_for_binlog in https://dev.mysql.com/doc/refman/5.5/en/innodb-parameters.html), InnoDB sets an exclusive lock for any of the indexed records it encounters, so the INSERT will fail until the DELETE is committed. To fix this, we just disable the transaction for MySQL and keep it for PostgreSQL. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55161
* | | | | | | Merge branch 'fix-part-of-55966' into 'master'Lin Jen-Shin2019-01-151-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore Repository::AmbiguousRefError in db/fixtures/development See merge request gitlab-org/gitlab-ce!24366