summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adding documentation on how to bulk migrate issuesdocs-bulk-migrate-issuesmac-key2019-01-211-0/+25
|
* Merge branch ↵Phil Hughes2019-01-214-5/+10
|\ | | | | | | | | | | | | | | | | '56622-admin-settings-cannot-read-property-addeventlistener-of-null' into 'master' Resolve "Admin Settings: Cannot read property 'addEventListener' of null" Closes #56622 See merge request gitlab-org/gitlab-ce!24522
| * Resolve "Admin Settings: Cannot read property 'addEventListener' of null"Martin Wortschack2019-01-214-5/+10
|/
* Merge branch 'qa-nightly-59-fix-new-label-button-hit-miss' into 'master'Fatih Acet2019-01-213-1/+17
|\ | | | | | | | | | | | | Fixes "New label" button hit miss Closes gitlab-org/quality/nightly#59 See merge request gitlab-org/gitlab-ce!24487
| * Add qa elementSanad Liaquat2019-01-182-2/+7
| |
| * Add comments explaining the waitSanad Liaquat2019-01-181-4/+5
| |
| * Wait for label svg to loadSanad Liaquat2019-01-182-1/+11
| |
* | Merge branch 'sh-preload-associations-for-group-api' into 'master'Douwe Maan2019-01-213-2/+25
|\ \ | | | | | | | | | | | | | | | | | | Eliminate N+1 queries in /api/groups/:id Closes #49845 See merge request gitlab-org/gitlab-ce!24513
| * | Eliminate N+1 queries in /api/groups/:idStan Hu2019-01-193-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15475/diffs, a significant amount of work went into eliminating N+1 queries in the /api/groups/:id/projects endpoint. We can reuse the `Entities::Project.prepare_relation` call on the projects. In a group with 2,573 projects on GitLab.com, this change significantly improves performance: * 18019 SQL queries down to 21 * Time spent in DB: 70 s down to 384 ms Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49845
* | | Merge branch 'revert-b479ddc7' into 'master'Grzegorz Bizon2019-01-212-14/+14
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'" See merge request gitlab-org/gitlab-ce!24521
| * | | Revert "Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'"Rémy Coutable2019-01-212-14/+14
| | | | | | | | | | | | | | | | | | | | This reverts merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24388
* | | | Merge branch '54401-search-project-tags-via-api' into 'master'Rémy Coutable2019-01-214-2/+25
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Search project tags via API Closes #54401 See merge request gitlab-org/gitlab-ce!24385
| * | | Search project tags via APIRobert Schilling2019-01-214-2/+25
|/ / /
* | | Merge branch 'raise-on-unfiltered-params' into 'master'Rémy Coutable2019-01-217-7/+28
|\ \ \ | | | | | | | | | | | | | | | | Set ActionController raise_on_unfiltered_parameters to true See merge request gitlab-org/gitlab-ce!24443
| * | | Actually set raise_on_unfiltered_parameters to trueJasper Maes2019-01-167-7/+28
| | | |
* | | | Merge branch 'sh-bump-katex-version-0.10.0' into 'master'Kushal Pandya2019-01-214-14/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump the katex package to 0.10.0 See merge request gitlab-org/gitlab-ce!24478
| * | | | Update spec/features/markdown/math_spec.rbAndrew Harmon2019-01-181-2/+2
| | | | | | | | | | | | | | | Refer to https://github.com/KaTeX/KaTeX/pull/1700 for additional details.
| * | | | Update yarn.lockAndrew Harmon2019-01-181-11/+6
| | | | |
| * | | | Update changelogs/unreleased/56507-sh-bump-katex-0.10.0.ymlAndrew Harmon2019-01-181-0/+5
| | | | |
| * | | | Update package.jsonAndrew Harmon2019-01-181-1/+1
| | | | |
* | | | | Merge branch 'docs-add-git-strategy-note' into 'master'Evan Read2019-01-201-0/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | add a note that GIT_STRATEGY is not supported for k8s executor See merge request gitlab-org/gitlab-ce!23974
| * | | | Add a note that GIT_STRATEGY is not supported for k8s executorAlexander Tanayno2019-01-181-0/+5
| | | | |
* | | | | Merge branch '56213-remove-error_tracking-feature-flag' into 'master'Kamil Trzciński2019-01-199-75/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove `error_tracking` feature flag" Closes #56213 See merge request gitlab-org/gitlab-ce!24306
| * | | | | Remove `error_tracking` feature flagPeter Leitzen2019-01-159-75/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We introduced the feature flag `error_tracking` to test the Sentry MVC safely. After the successful test, we remove it again.
* | | | | | Merge branch '56389-remove-unwanted-suggestion-flash-margin' into 'master'Annabel Dunstone Gray2019-01-183-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unwanted margin above suggested changes. Closes #56389 See merge request gitlab-org/gitlab-ce!24419
| * | | | | | Remove unwanted margin above suggested changes.Jacques Erasmus2019-01-183-2/+7
|/ / / / / /
* | | | | | Merge branch 'docs-fix-migrations-readme' into 'master'Robert Speicher2019-01-181-16/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements for spec migration readme See merge request gitlab-org/gitlab-ce!24440
| * | | | | | Reorders migrations readme fileMayra Cabrera2019-01-171-16/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The document is now split in two sections: - Testing an ActiveRecord migration - Testing an non-ActiveRecord migration Both sections have an example
* | | | | | | Merge branch 'docs-patch-38' into 'master'Kushal Pandya2019-01-181-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update vuex.md - swap PUT/POST methods See merge request gitlab-org/gitlab-ce!24494
| * | | | | | | Update vuex.md - swap PUT/POST methodsFilipa Lacerda2019-01-181-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'qa-fix-resource-attribute' into 'master'Mark Lapierre2019-01-186-17/+62
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Resource attribute bug See merge request gitlab-org/gitlab-ce!24407
| * | | | | | | | Update merge fork testMark Lapierre2019-01-174-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Resources don't share attributes, Fork doesn't have Project attributes. That caused the merge fork test to fail because it no longer had access to repository_http_location via Fork. Rather than give Fork Project attributes directly, we add a project attribute to Fork and populate it via the API at the end of the fabricate! method after the fork has been created via the UI. We also update the merge fork test to be slightly more concise and consistent with newer tests by using perform with proc coercion instead of act or perform with the full block syntax.
| * | | | | | | | Fix Resource attribute bugMark Lapierre2019-01-152-11/+37
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Resources to have the same attribute name but different attribute values
* | | | | | | | Merge branch 'sengelhard-fix-reference-to-label' into 'master'Achilleas Pipinellis2019-01-181-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update reference to ~Monitoring to be ~Monitor See merge request gitlab-org/gitlab-ce!24489
| * | | | | | | | Update reference to ~Monitoring to be ~MonitorSeth Engelhard2019-01-181-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch ↵Achilleas Pipinellis2019-01-181-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56254-follow-up-from-change-update-instructions-for-node-from-6-to-8' into 'master' Correct minimum yarn version in 11.6 -> 11.7 upgrade doc Closes #56254 See merge request gitlab-org/gitlab-ce!24495
| * | | | | | | | Correct yarn version in 11.6 -> 11.7 upgrade docLukas 'Eipi' Eipert2019-01-181-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'osw-enforces-project-removal-with-past-failed-attempts' into ↵Nick Thomas2019-01-183-5/+58
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Cleanup stale +deleted repo paths on project removal (adjusts project removal bug) Closes #46146 See merge request gitlab-org/gitlab-ce!24269
| * | | | | | | | | Cleanup stale +deleted repo paths on project removalOswaldo Ferreira2019-01-183-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. When removing projects, we can end-up leaving the +deleted repo path dirty and not successfully removing the non-deleted namespace (mv process is not atomic and can be killed without fully moving the path). 2. In order to solve that, we're adding a clean-up phase on ensure which will schedule possible staled +deleted path deletion. Note that we don't check the current state (if there is or not a repo) in order to schedule the deletion. That's intentional in order to leverage Gitlab::GitalyClient::NamespaceService#remove idempotency and ensure consistency.
* | | | | | | | | | Merge branch 'view-epic-permissions' into 'master'Sean McGivern2019-01-181-3/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | View epic permissions See merge request gitlab-org/gitlab-ce!24483
| * | | | | | | | | Update permissions.mdVictor Wu2019-01-181-3/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'api-nested-group-permission' into 'master'Nick Thomas2019-01-185-1/+80
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the maximum group access level in the projects API Closes #43684 See merge request gitlab-org/gitlab-ce!24403
| * | | | | | | | | Return max group access level in the projects APIAlejandro Rodríguez2019-01-165-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a project is inside a nested group and a user doesn't have specific permissions for that group but does have permissions on a parent group the `GET /projects/:id` API call will return the following permissions: ```json permissions: { project_access: null, group_access: null } ``` It could also happen that the group specific permissions are of lower level than the ones the user has in parent groups. This patch makes it so that the permission returned for `group_access` is the highest from amongst the hierarchy, which is (ostensibly) the information that the API user is interested in for that field.
* | | | | | | | | | Merge branch '56473-update-nginx-docs' into 'master'Achilleas Pipinellis2019-01-183-13/+74
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for new NGINX Ingress metrics Closes #56473 See merge request gitlab-org/gitlab-ce!24449
| * | | | | | | | | | Add documentation for new NGINX Ingress metricsJoshua Lambert2019-01-183-13/+74
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ce-issue_7526' into 'master'Fatih Acet2019-01-184-8/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [EE Backport] Add notes filters for epics See merge request gitlab-org/gitlab-ce!24372
| * | | | | | | | | | [EE Backport] Add notes filters for epicsFelipe Artur2019-01-144-8/+18
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '30120-add-flat-square-badge-style' into 'master'Grzegorz Bizon2019-01-185-4/+94
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add flat-square badge style Closes #30120 See merge request gitlab-org/gitlab-ce!24172
| * | | | | | | | | | | Add flat-square badge styleFabian Schneider2019-01-185-4/+94
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'Grzegorz Bizon2019-01-182-14/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MR IID in Review Apps slug and domain See merge request gitlab-org/gitlab-ce!24388