summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | 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
| * | | | | | | | | | | | | | Use MR IID in Review Apps slug and domainRémy Coutable2019-01-152-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch ↵Kushal Pandya2019-01-182-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56328-frequent-items-initialisations-can-be-optimised-and-deferred-in-idlecallback' into 'master' Resolve "Frequent Items Initialisations can be optimised and deferred in idleCallback" Closes #56328 See merge request gitlab-org/gitlab-ce!24401
| * | | | | | | | | | | | | | Changed function setupTim Zallmann2019-01-181-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed problem when element in main menu is not there (specs)Tim Zallmann2019-01-181-1/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Moves the Initialisation of the frequent Item Dropdowns to Idle CallbackTim Zallmann2019-01-162-1/+10
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'an-dtracing-test-for-invalid-tracers' into 'master'Kamil Trzciński2019-01-183-17/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid overwriting default jaeger values with nil See merge request gitlab-org/gitlab-ce!24482
| * | | | | | | | | | | | | | | Avoid overwriting default jaeger values with nilAndrew Newdigate2019-01-183-17/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the review process for adding opentracing factories, a bug was introduced which caused Jaeger to initialize an invalid tracer. The bug was due to use sending nil through as a kwarg when the Jaeger initializer used a non-nil default value. This is fairly insidious as, the tracer looks like a tracer, but, when methods are invoked, it throws `NoMethodError` errors. To ensure that this issue does not happen in future, the tests have been changed to ensure that the tracer works as expected. This could avoid problems in future when upgrading to newer versions of Jaeger.
* | | | | | | | | | | | | | | | Merge branch 'fix-runner-eternal-loop-when-update-job-result' into 'master'Kamil Trzciński2019-01-183-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix runner eternal loop when update job result Closes #56518 See merge request gitlab-org/gitlab-ce!24481
| * | | | | | | | | | | | | | | | Fix runner eternal loop when update job resultShinya Maeda2019-01-183-1/+31
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec Add changelog
* | | | | | | | | | | | | | | | Merge branch 'diff-tree-collapse-directories' into 'master'Filipa Lacerda2019-01-189-8/+243
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapses directory structure in merge request tree Closes #53069 See merge request gitlab-org/gitlab-ce!24392
| * | | | | | | | | | | | | | | Added specs for mutations & utils methodsPhil Hughes2019-01-162-0/+141
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Collapses directory structure in merge request treePhil Hughes2019-01-157-8/+102
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53069
* | | | | | | | | | | | | | | Merge branch 'sh-bump-rbtrace-version' into 'master'Rémy Coutable2019-01-181-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rbtrace version to 0.4.11 See merge request gitlab-org/gitlab-ce!24476
| * | | | | | | | | | | | | | Bump rbtrace version to 0.4.11Stan Hu2019-01-171-5/+5
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change renames a dependency and fixes a minor bug, but this upgrade is happening because Gitaly will be receiving rbtrace as a dependency.
* | | | | | | | | | | | | | Merge branch '55544-port-upgrade-command' into 'master'Kamil Trzciński2019-01-184-6/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port generic Helm upgrade functionality to CE See merge request gitlab-org/gitlab-ce!23924
| * | | | | | | | | | | | | | Refactor some methods in Prometheus modelThong Kuah2019-01-182-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - #update_errored? method def is redundant, already defined from state machine - #update_in_progress? moved to ApplicationStatus - #ready_status becomes a constant. Previously it was extended in ee/ so maybe that was why it's a instance method
| * | | | | | | | | | | | | | Port generic upgrade functionality to CE55544-port-upgrade-commandThong Kuah2019-01-153-1/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port from EE generic upgrade related functionality used to upgrade Helm applications Remove memoization which could be incorrect It looks like we are memoizing without regard to the method's argument so this could result in an incorrect upgrade_command Remove `const_get` indirection now we are no longer in EE
* | | | | | | | | | | | | | | Merge branch 'export-default-in-vuex-shared-modal-actions' into 'master'Kushal Pandya2019-01-181-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export default in vuex_shared/modal/actions See merge request gitlab-org/gitlab-ce!24435
| * | | | | | | | | | | | | | | Export default in vuex_shared/modal/actionsPaul Slaughter2019-01-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** This prevents erros when using actions in karma test.
* | | | | | | | | | | | | | | | Merge branch 'user-avatar-list-empty-text' into 'master'Kushal Pandya2019-01-182-15/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle emptyText in user_avatar_list See merge request gitlab-org/gitlab-ce!24436
| * | | | | | | | | | | | | | | | Handle emptyText in user_avatar_listPaul Slaughter2019-01-162-15/+47
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** To reduce duplicate code, it's helpful to encapsulate this behavior here.
* | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Evan Read2019-01-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CI variables in CI docker build examples See merge request gitlab-org/gitlab-ce!24130
| * | | | | | | | | | | | | | | Use CI variables in CI docker build examplesSiim Tiilen2019-01-181-3/+3
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'Projects--dropdown-is-misaligned-on-issue-boards-page' into ↵Annabel Dunstone Gray2019-01-175-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Projects dropdown is misaligned on issue boards page Closes #48682 and #54920 See merge request gitlab-org/gitlab-ce!24277
| * | | | | | | | | | | | | | | fix misaligned projects dropdownJohann Hubert Sonntagbauer2019-01-175-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dropdown position * add empty state list overflow * avoid double scrollbars in project dropdown
* | | | | | | | | | | | | | | | Merge branch '55256-bs-spacer' into 'master'Annabel Dunstone Gray2019-01-171-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spacer and spacers as overrides Closes #55256 See merge request gitlab-org/gitlab-ce!24459
| * | | | | | | | | | | | | | | | Add spacer and spacers as overridesRajat Jain2019-01-171-0/+9
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'qa-grid-empty-check' into 'master'Dan Davison2019-01-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let QA_REMOTE_GRID be nil or empty string See merge request gitlab-org/gitlab-ce!24468
| * | | | | | | | | | | | | | | | | Let guard catch QA_REMOTE_GRID blank or nilddavison2019-01-171-1/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'review-apps-do-not-exit-when-dependable-job-fails' into 'master'Mark Lapierre2019-01-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Review Apps] Don't exit when dependable job fails See merge request gitlab-org/gitlab-ce!24469
| * | | | | | | | | | | | | | | | | [Review Apps] Don't exit when dependable job failsRémy Coutable2019-01-171-1/+0
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function that retrieves the dependable job is pretty basic and retrieves the first job found with the matching name, but this job can be failed but then successfully retried. In that case, we would exit the depending job even though the dependable job actually succeeded (the second time). Let's simplify things, be optimistic and continue with the depending job even if the dependable job fails. That reverts to the original behavior. Signed-off-by: Rémy Coutable <remy@rymai.me>