summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'feature/gb/pipeline-only-except-with-modified-paths'feature/gb/pipeline-only-except-with-modified-pathsKamil Trzciński2018-10-04767-11907/+48338
|\ | | | | | | # Conflicts: # app/models/ci/pipeline.rb
| * Merge branch '47496-more-n-1s-in-calculating-notification-recipients' into ↵Robert Speicher2018-10-044-16/+50
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "More N+1s in calculating notification recipients" Closes #47496 See merge request gitlab-org/gitlab-ce!22050
| | * Add changelog entrySean McGivern2018-10-041-0/+5
| | |
| | * Fix N+1 for notification recipients on private projectsSean McGivern2018-10-042-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't call #to_a, we're relying on the members already being loaded from elsewhere. Otherwise we'll do a separate query for each user: [1] pry(main)> Project.first.team.members.include?(User.first) Project Load (0.7ms) SELECT "projects".* FROM "projects" ORDER BY "projects"."id" ASC LIMIT 1 ↳ (pry):3 User Load (1.8ms) SELECT "users".* FROM "users" ORDER BY "users"."id" ASC LIMIT 1 ↳ (pry):3 User Exists (0.6ms) SELECT 1 AS one FROM "users" INNER JOIN "project_authorizations" ON "users"."id" = "project_authorizations"."user_id" WHERE "project_authorizations"."project_id" = $1 AND "users"."id" = $2 LIMIT 1 [["project_id", 1], ["id", 1]] ↳ (pry):3 => true [2] pry(main)> Project.first.team.members.to_a.include?(User.first) Project Load (12.8ms) SELECT "projects".* FROM "projects" ORDER BY "projects"."id" ASC LIMIT 1 ↳ (pry):1 User Load (9.6ms) SELECT "users".* FROM "users" INNER JOIN "project_authorizations" ON "users"."id" = "project_authorizations"."user_id" WHERE "project_authorizations"."project_id" = $1 [["project_id", 1]] ↳ (pry):1 User Load (0.6ms) SELECT "users".* FROM "users" ORDER BY "users"."id" ASC LIMIT 1 ↳ (pry):1 => true
| | * Fix N+1 for notification recipients in subscribersSean McGivern2018-10-042-15/+40
| | |
| * | Merge branch 'new-docs-linting-image' into 'master'Achilleas Pipinellis2018-10-041-3/+3
| |\ \ | | | | | | | | | | | | | | | | Change image for docs linting See merge request gitlab-org/gitlab-ce!22100
| | * | Change image for docs lintingEvan Read2018-10-041-3/+3
| | | |
| * | | Merge branch '50552-unable-to-close-performance-bar' into 'master'Annabel Dunstone Gray2018-10-043-1/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Unable to close performance bar" Closes #50552 See merge request gitlab-org/gitlab-ce!21577
| | * | | Make perfbar z-index above modal background50552-unable-to-close-performance-barSimon Knox2018-10-043-1/+8
| | | | |
| * | | | Merge branch '52178-markdown-table-borders' into 'master'Phil Hughes2018-10-042-3/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown table border and background color Closes #52178 See merge request gitlab-org/gitlab-ce!22090
| | * | | | Fix markdown table border and background colorAnnabel Dunstone Gray2018-10-042-3/+12
| |/ / / /
| * | | | Merge branch 'add-pipeline-in-mr-docs' into 'master'Achilleas Pipinellis2018-10-041-209/+473
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve the MR documentation See merge request gitlab-org/gitlab-ce!22086
| | * | | | Improve the MR documentationRémy Coutable2018-10-041-209/+473
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch '48222-fix-todos-status-button' into 'master'Phil Hughes2018-10-042-3/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error while updating todo status: the button is stuck in the loading state" Closes #48222 See merge request gitlab-org/gitlab-ce!20994
| | * | | | | Resolve "Error while updating todo status: the button is stuck in the ↵Marcos Barrera2018-10-042-3/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | loading state"
| * | | | | Merge branch 'dz-labels-subscribe-filter' into 'master'Dmitriy Zaporozhets2018-10-0421-53/+213
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Add subscribe filter to labels page See merge request gitlab-org/gitlab-ce!21965
| | * | | | Refactor labels_filter_path and labels navdz-labels-subscribe-filterDmitriy Zaporozhets2018-10-049-50/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor labels_filter_path method to be consistent with other similar methods like search_filter_path, milestones_filter_path etc. Also move repeating code in labels index page nav into shared partial Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Add subscribe filter to labels pageDmitriy Zaporozhets2018-10-0414-21/+190
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch 'backport-ee-merge-spec-changes' into 'master'Sean McGivern2018-10-042-12/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE merge spec changes See merge request gitlab-org/gitlab-ce!22108
| | * | | | | Allow Gitaly N+1s in MR finder specSean McGivern2018-10-041-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These can be triggered by project creation in the setup phase if a spec uses the RequestStore, but we really don't care about that - it's not an N+1, it's just several projects being created!
| | * | | | | Remove vestigial method from MergeRequestsFinderSean McGivern2018-10-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't called from anywhere.
| * | | | | | Merge branch '50904-empty-states' into 'master'Phil Hughes2018-10-0411-40/+274
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders empty states in the Vue app in Job page See merge request gitlab-org/gitlab-ce!22087
| | * | | | | | Renders empty states in the Vue app in Job pageFilipa Lacerda2018-10-0411-40/+274
| |/ / / / / /
| * | | | | | Merge branch 'clone-nurtch-demo-repo' into 'master'Dmitriy Zaporozhets2018-10-043-1/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clone nurtch demo notebooks at Jupyter startup See merge request gitlab-org/gitlab-ce!21698
| | * | | | | | Clone nurtch demo notebooks at Jupyter startupAmit Rathi2018-10-043-1/+10
| |/ / / / / /
| * | | | | | Merge branch 'ce-7287-epic-references' into 'master'Nick Thomas2018-10-043-6/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support short reference to epics from project entities See merge request gitlab-org/gitlab-ce!22048
| | * | | | | | Support short reference to group entities from project entitiesce-7287-epic-referencesJarka Košanová2018-10-043-6/+13
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add a direct project parent (group) to Banzai context - if an epic is referenced from a direct descendant -> change epic to_reference to use short reference
| * | | | | | Merge branch ↵Stan Hu2018-10-041-2/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52195-backport-removal-of-additionalproperties-false-runners-schema' into 'master' Remove addtionalProperties in runners schema Closes #52195 See merge request gitlab-org/gitlab-ce!22105
| | * | | | | Remove addtionalProperties in runners schemaSteve Azzopardi2018-10-041-2/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted into failure on EE pipeline, for more information follow from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7600#note_105310648 onwards.
| * | | | | Merge branch '49329-mr-show-commit-details' into 'master'Fatih Acet2018-10-047-5/+107
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add signature badge and pipeline status to commit details in MR diff Closes #49329 See merge request gitlab-org/gitlab-ce!22079
| | * | | | | Add pipeline status to diffs/commit_item49329-mr-show-commit-detailsPaul Slaughter2018-10-036-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Notes:** - Also exposes commit.pipeline_status_path in diffs.json
| | * | | | | Add signature badge to diffs/commit_itemPaul Slaughter2018-10-035-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Notes:** - Also exposes commit.signature_html in diffs.json
| * | | | | | Merge branch 'docs/fix-links-to-subgit' into 'master'Achilleas Pipinellis2018-10-041-3/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links to external site and minor Markdown improvements See merge request gitlab-org/gitlab-ce!22098
| | * | | | | | Fix links to external site and minor Markdown improvementsEvan Read2018-10-041-3/+4
| | | | | | | |
| * | | | | | | Merge branch 'ce-7723-epic-commands-autocomplete' into 'master'Rémy Coutable2018-10-041-6/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port: Add checks to InterpretService conditions See merge request gitlab-org/gitlab-ce!22047
| | * | | | | | | Add checks to InterpretService conditionsce-7723-epic-commands-autocompleteJarka Košanová2018-10-031-6/+13
| | | | | | | | |
| * | | | | | | | Merge branch '44597-auto-devops-rbac-qa-spec' into 'master'Rémy Coutable2018-10-046-52/+118
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a QA spec for RBAC cluster and auto devops See merge request gitlab-org/gitlab-ce!22025
| | * | | | | | | | Add a QA spec for RBAC cluster and auto devopsDylan Griffith2018-10-046-52/+118
| | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | This fails now because we have not yet implemented support for this
| * | | | | | | | Merge branch '52065-fix-environment-name-overlap' into 'master'Filipa Lacerda2018-10-042-3/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix environment name overlapping Closes #52065 See merge request gitlab-org/gitlab-ce!22104
| | * | | | | | | | add changelog entryjerasmus2018-10-041-0/+4
| | | | | | | | | |
| | * | | | | | | | fix environment name overlapping + tooltip positioningjerasmus2018-10-041-3/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch '52192-fix-faulty-yarn-lock' into 'master'Phil Hughes2018-10-041-69/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix faulty resolution of babel-messages in yarn.lock Closes #52192 See merge request gitlab-org/gitlab-ce!22111
| | * | | | | | | | | Dedupe yarn dependenciesLukas Eipert2018-10-041-62/+9
| | | | | | | | | | |
| | * | | | | | | | | Fix `babel-messages` dependencyLukas Eipert2018-10-041-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know if the issue [0] was caused by a faulty merge, or why, but it seems like babel-messages had the wrong URL in there and resolved to babel-plugin-transform-object-rest-spread, which is wrong. So the integrity check did actually work and catch that! [0]: https://gitlab.com/gitlab-org/gitlab-ce/issues/52192
| * | | | | | | | | | Merge branch '40636-instance-configuration-shows-incorrect-ssh-fingerprints' ↵Nick Thomas2018-10-044-6/+11
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Instance Configuration page now displays correct SSH fingerprints Closes #40636 See merge request gitlab-org/gitlab-ce!22081
| | * | | | | | | | | | Instance Configuration page now displays correct SSH fingerprintsTiago Botelho2018-10-034-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the use of OpenSSL::Digest for Gitlab::SSHPublicKey#fingerprint
| * | | | | | | | | | | Merge branch ↵Rémy Coutable2018-10-043-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '#51457-Show-percentage-of-language-detection-on-the-language-bar' into 'master' Show percentage of language detection on the language bar Closes #51457 See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22056
| | * | | | | | | | | | | proper escape language nameJohann Hubert Sonntagbauer2018-10-031-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | add changelogJohann Hubert Sonntagbauer2018-10-031-0/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | fix lintingJohann Hubert Sonntagbauer2018-10-031-1/+1
| | | | | | | | | | | | |
View Lorry Controller Status