summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'jl-update-ff-process-docs' into 'master'Marin Jankovski2019-02-151-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add guidance for the initial state of a feature flag See merge request gitlab-org/gitlab-ce!24829
| * | | | | | | | | | | | | Fix grammar in feature flags section, add link to docsjl-update-ff-process-docsJoshua Lambert2019-02-141-5/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Clarify feature flag status in PROCESS.mdMarin Jankovski2019-02-121-1/+11
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'docs/refactor-api-landing-page' into 'master'Achilleas Pipinellis2019-02-157-111/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor of API landing page See merge request gitlab-org/gitlab-ce!25076
| * | | | | | | | | | | | | | Refactor of API landing pageEvan Read2019-02-157-111/+150
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Breaks up into more sections. - Also minor fixes to pages within sections.
* | | | | | | | | | | | | | Merge branch ↵Marcia Ramos2019-02-151-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36263-the-award-emoji-api-has-an-incorrect-description-of-the-id-parameter' into 'master' Clarify IDs in the award emoji API Closes #36263 See merge request gitlab-org/gitlab-ce!25215
| * | | | | | | | | | | | | | API: Clarify the award emoji docsRobert Schilling2019-02-131-5/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '56485-implement-graphql-mergerequestsresolver' into 'master'James Lopez2019-02-1514-22/+240
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Implement GraphQL MergeRequestsResolver" Closes #56485 See merge request gitlab-org/gitlab-ce!24805
| * | | | | | | | | | | | | | | Use a block and move setup to example directly56485-implement-graphql-mergerequestsresolverLin Jen-Shin2019-02-142-4/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Instead of returning all or nothing, return whichever passedLin Jen-Shin2019-02-143-13/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add tests
| * | | | | | | | | | | | | | | Implement singular iid for IssuesResolver and ProjectTypeLin Jen-Shin2019-02-144-4/+16
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Allow authorize on array of objects for GraphQLLin Jen-Shin2019-02-144-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add tests
| * | | | | | | | | | | | | | | Add tests for BaseResolver and update accordinglyLin Jen-Shin2019-02-143-9/+59
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add field mergeRequests for project in GraphQLLin Jen-Shin2019-02-147-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix the tests so that it won't run into circular paths.
* | | | | | | | | | | | | | | | Merge branch 'ce-1979-fe-multiple-approval-rules' into 'master'Phil Hughes2019-02-155-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port of Multiple merge request approval rules See merge request gitlab-org/gitlab-ce!25193
| * | | | | | | | | | | | | | | | CE Port of Multiple merge request approval rulesPaul Slaughter2019-02-135-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
* | | | | | | | | | | | | | | | | Merge branch '57692-fix-rendering-of-none-any' into 'master'Phil Hughes2019-02-152-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search bar rendering `none` and `any` as users" Closes #57692 See merge request gitlab-org/gitlab-ce!25235
| * | | | | | | | | | | | | | | | Fix rendering of user token special valuesHeinrich Lee Yu2019-02-142-1/+12
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include capitalized `none` and `any` as special values
* | | | | | | | | | | | | | | | Merge branch '49502-gpg-signature-api-endpoint' into 'master'Douwe Maan2019-02-156-0/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an API endpoint to get the GPG signature of a commit Closes #49502 See merge request gitlab-org/gitlab-ce!25032
| * | | | | | | | | | | | | | | | Add API docs for commit's GPG signature endpoint49502-gpg-signature-api-endpointBalasankar "Balu" C2019-02-143-0/+49
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add specs for commit's GPG signature API endpointBalasankar "Balu" C2019-02-141-0/+38
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add API endpoint to get a commit's GPG signatureBalasankar "Balu" C2019-02-142-0/+23
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sh-fix-board-user-assigns' into 'master'Douglas Barbosa Alexandre2019-02-144-1/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 403 errors when adding an assignee list in project boards Closes gitlab-ee#9727 See merge request gitlab-org/gitlab-ce!25263
| * | | | | | | | | | | | | | | | Fix 403 errors when adding an assignee list in project boardsStan Hu2019-02-144-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in `BoardPolicy`, users were getting back a 403 error when trying to assign users to an assignee list and seeing "Something went wrong while fetching assignees list". For some reason, the declarative policy runtime was ignoring the ternary condition. To work around the issue, we make the project board an explicit condition check. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9727
* | | | | | | | | | | | | | | | | Merge branch 'qa-ml-check-server-in-before-hook' into 'master'Mark Lapierre2019-02-144-15/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA-CE] Move server responding check to scenario before hook See merge request gitlab-org/gitlab-ce!25257
| * | | | | | | | | | | | | | | | | Move server responding check to scenario before hookMark Lapierre2019-02-144-15/+12
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checks that the server is responding before any other actions, including before trying to add a license.
* | | | | | | | | | | | | | | | | Merge branch 'ac-secpick-template' into 'master'Robert Speicher2019-02-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Select Security Release template with secpick See merge request gitlab-org/gitlab-ce!25246
| * | | | | | | | | | | | | | | | | Select Security Release template with secpickAlessio Caiazza2019-02-141-2/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'filter-note-parameters' into 'master'Stan Hu2019-02-143-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include additional fields in the Rails filter_parameters configuration See merge request gitlab-org/gitlab-ce!25238
| * | | | | | | | | | | | | | | | | | Filter note parametersAndrew Newdigate2019-02-143-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds `note` to the Rails `filter_parameters` configuration.
* | | | | | | | | | | | | | | | | | | Merge branch 'inline-web-worker-cors' into 'master'Filipa Lacerda2019-02-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed web workers not working locally in rspec Closes #57169 See merge request gitlab-org/gitlab-ce!25194
| * | | | | | | | | | | | | | | | | | | Fixed web workers not working locally in rspecPhil Hughes2019-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57169
* | | | | | | | | | | | | | | | | | | | Merge branch 'web-ide-commit-header-icon-alignment-fix' into 'master'Filipa Lacerda2019-02-144-4/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes alignment of changed icon in Web IDE Closes #57649 See merge request gitlab-org/gitlab-ce!25202
| * | | | | | | | | | | | | | | | | | | | Fixes alignment of changed icon in Web IDEPhil Hughes2019-02-134-4/+36
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57649
* | | | | | | | | | | | | | | | | | | | Merge branch 'fix-metrics-reload' into 'master'Stan Hu2019-02-1411-24/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly handle class constant references See merge request gitlab-org/gitlab-ce!25102
| * | | | | | | | | | | | | | | | | | | | Update Metrics references to Object pathSarah Yasonik2019-02-1411-24/+24
|/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On reload, references to Metrics within classes in the Gitlab::Metrics module fail. Update all references to ::Gitlab::Metrics so that constant lookup finds the right module in development. This fix should not impact production.
* | | | | | | | | | | | | | | | | | | | Merge branch 'tz-stylelint' into 'master'Annabel Dunstone Gray2019-02-1418-131/+1024
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Stylelint Setup See merge request gitlab-org/gitlab-ce!25148
| * | | | | | | | | | | | | | | | | | | | Added Stylelint SetupTim Zallmann2019-02-1418-131/+1024
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added stylelint to static-analysis Updated yarn dependencies CSS Fixes and rule adoptions of stylelint Added stylelint-scss Deduplicated yarn.lock to clear dependencies
* | | | | | | | | | | | | | | | | | | | | Merge branch 'improve-error-tracking-docs' into 'master'Achilleas Pipinellis2019-02-142-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs with permissions required for error tracking See merge request gitlab-org/gitlab-ce!25208
| * | | | | | | | | | | | | | | | | | | | Add line to doc listing reqd Sentry token scopesReuben Pereira2019-02-142-0/+9
|/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a line to say that event:read and project:read are required. project:read is not strictly required right now, but will be when the project dropdown is released next month.
* | | | | | | | | | | | | | | | | | | | Merge branch 'make-danger-ask-for-backend-review-for-.gitlab-ci.yml' into ↵Nick Thomas2019-02-142-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Make Danger as for backend review for .gitlab-ci.yml See merge request gitlab-org/gitlab-ce!25251
| * | | | | | | | | | | | | | | | | | | | Make Danger as for backend review for .gitlab-ci.ymlRémy Coutable2019-02-142-7/+8
| | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | Merge branch 'do-not-retry-jobs-in-quarantine' into 'master'Lin Jen-Shin2019-02-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not retry jobs in quarantine since they are supposed to fail See merge request gitlab-org/gitlab-ce!25248
| * | | | | | | | | | | | | | | | | | | | Do not retry jobs in quarantine since they are supposed to failRémy Coutable2019-02-141-0/+1
| |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | Merge branch ↵Nick Thomas2019-02-144-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44740-api-to-verify-a-given-user-has-right-to-merge-a-given-mergerequest' into 'master' API: Expose if the user can merge a given merge request Closes #44740 See merge request gitlab-org/gitlab-ce!25207
| * | | | | | | | | | | | | | | | | | | | API: Expose if the user can merge a given merge requestRobert Schilling2019-02-144-0/+24
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'simplify-secpick-git-commands' into 'master'Nick Thomas2019-02-141-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify bin/secpick git commands See merge request gitlab-org/gitlab-ce!25240
| * | | | | | | | | | | | | | | | | | | Simplify bin/secpick git commandsPavel Shutsin2019-02-141-3/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'reduce-diff-with-ee-in-app-services' into 'master'Lin Jen-Shin2019-02-1413-35/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce remaining diff with EE in app/services See merge request gitlab-org/gitlab-ce!24968
| * | | | | | | | | | | | | | | | | | | | Reduce remaining diff with EE in app/servicesRémy Coutable2019-02-1413-35/+62
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>