summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace look-alike token with '<your_access_token>'docs/fake-token-no-moreAchilleas Pipinellis2019-01-0460-375/+374
| | | | | Replace all '9koXpg98eAheJpvBs5tK' occurrences with '<your_access_token>' in API docs.
* Merge branch 'ee1979-gl-modal-vuex' into 'master'Kushal Pandya2019-01-049-0/+353
|\ | | | | | | | | Create shared gl-modal-vuex component and module See merge request gitlab-org/gitlab-ce!24140
| * Create shared gl-modal-vuex component and moduleee1979-gl-modal-vuexPaul Slaughter2019-01-039-0/+353
| | | | | | | | | | | | | | **Why?** It is significantly easier to manage the visibility of the modal in Vuex. The module contains the state and mutations to manage this. The component wraps GlModal and syncs the visibility with the module.
* | Merge branch '43623-add-submit-feedback-in-product-feedback-link' into 'master'Kushal Pandya2019-01-043-0/+11
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Add "Submit feedback" in-product feedback link" Closes #43623 See merge request gitlab-org/gitlab-ce!23547
| * | Add submit feedback link to help dropdown43623-add-submit-feedback-in-product-feedback-linkBrandon Labuschagne2019-01-043-0/+11
| | |
* | | Merge branch '53696-make-rbac-default' into 'master'Kamil Trzciński2019-01-0418-113/+95
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make RBAC enabled by default for new clusters Closes #53696 See merge request gitlab-org/gitlab-ce!24119
| * | | Make RBAC enabled default for new clustersDylan Griffith2019-01-0418-113/+95
| | | | | | | | | | | | | | | | | | | | Many changes were also made to tests that expected this to default to false.
* | | | Merge branch 'tz-make-user-popover-spec-more-consistent' into 'master'Kushal Pandya2019-01-041-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Made user_popovers_spec more stable See merge request gitlab-org/gitlab-ce!24145
| * | | | Made user_popovers_spec more stable on the value sidetz-make-user-popover-spec-more-consistentTim Zallmann2019-01-041-6/+10
| | | | |
* | | | | Merge branch 'ce-revert-revert-gold-trial-mrs' into 'master'Kamil Trzciński2019-01-0423-57/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bring back reverted Gold Trial MR (CE backport) See merge request gitlab-org/gitlab-ce!23621
| * | | | | Port GitLab.com gold trial callout changes to CEce-revert-revert-gold-trial-mrsLuke Bennett2019-01-0323-57/+140
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8731
* | | | | | Merge branch 'use-cheap-operation-for-ci-pipeline-all_merge_requests' into ↵Kamil Trzciński2019-01-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use cheap operation for `Ci::Pipeline#all_merge_requests` Closes #54907 See merge request gitlab-org/gitlab-ce!24115
| * | | | | | Use cheap operation for `Ci::Pipeline#all_merge_requests`use-cheap-operation-for-ci-pipeline-all_merge_requestsShinya Maeda2019-01-031-1/+1
| | | | | | |
* | | | | | | Merge branch 'add-a-comment-on-ci-pipeline-git_ref-about-merge-request-ref' ↵Kamil Trzciński2019-01-041-0/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add a comment on `Ci::Pipeline#git_ref` about merge request ref Closes #54908 See merge request gitlab-org/gitlab-ce!24114
| * | | | | | Add a comment on `Ci::Pipeline#git_ref` about merge request refadd-a-comment-on-ci-pipeline-git_ref-about-merge-request-refShinya Maeda2019-01-031-0/+6
| |/ / / / /
* | | | | | Merge branch 'sh-skip-validation-visibility-changed' into 'master'Douwe Maan2019-01-043-2/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only validate project visibility when it has changed Closes #55881 See merge request gitlab-org/gitlab-ce!24142
| * | | | | | Only validate project visibility when it has changedsh-skip-validation-visibility-changedStan Hu2019-01-033-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On GitLab.com, there are hundreds of projects that have visibility levels that are inconsistent with the fork or group settings. Most likely, this happened during a GitLab project import because the validation was bypassed. Attempting to migrate these projects to hashed storage fails even though the migration doesn't touch the visibility settings. Skipping the visibility validation allows the migration to go through. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55881
* | | | | | | Merge branch ↵Kamil Trzciński2019-01-046-43/+141
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49056-configure-auto-devops-deployed-applications-with-secrets-that-aren-t-committed-to-the-repo' into 'master' Configure Auto DevOps deployed applications with secrets from prefixed CI variables See merge request gitlab-org/gitlab-ce!23719
| * | | | | | | QA spec for Auto DevOps application secrets49056-configure-auto-devops-deployed-applications-with-secrets-that-aren-t-committed-to-the-repoThong Kuah2019-01-042-31/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assert that a K8S_SECRET_* variable is ingestible by our Rack application Re-use project and cluster resources in Auto DevOps QA
| * | | | | | | Update CI/CD variables help textThong Kuah2019-01-042-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hint about adding variables for Auto DevOps application variables and link to More information
| * | | | | | | DRY up some functions in Auto-DevOps scriptThong Kuah2019-01-041-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DRY up setting deploy name - DRY up application_secret_name
| * | | | | | | Remove application secret on stopping environmentThong Kuah2019-01-041-0/+3
| | | | | | | |
| * | | | | | | Simplify bash functionThong Kuah2019-01-041-27/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use --from-env-file with bash process substitution We still need bash as process substition (`<()`) is not available in sh
| * | | | | | | Solve multi word CI variables not quoted properlyThong Kuah2019-01-041-25/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ie. fix below quoting issue: ``` kubectl create secret -n project-with-autodevops-900057eb1ce34399-77 \ generic production-secret \ '--from-literal=OPTIONAL_MESSAGE=You' can see this secret \ -o yaml --dry-run ``` With fix, it should be generating: ``` kubectl create secret -n project-with-autodevops-900057eb1ce34399-77 \ generic production-secret \ --from-literal 'OPTIONAL_MESSAGE=You can see this secret' \ -o yaml --dry-run ``` Call via bash -c, instead of assuming bash The shell is /bin/sh, so we cannot asssume bash. Hence we use `bash -c` bash is installed for deploy jobs in a prior step
| * | | | | | | Create K8S_SECRET_* CI variables as a K8s SecretThong Kuah2019-01-042-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find any CI variables from `env` which has a prefix. If there are any such CI variables, strip prefix from variable name then create a generic Kubernetes secret containing all these CI variables as key-value pairs. Also, Pass in secretname to application container The secretname may be present, if nil, the chart does nothing. If present, the chart will load the key-value pairs from the secret into the application container. See https://gitlab.com/charts/auto-deploy-app/blob/master/README.md#configuration
* | | | | | | | Merge branch 'docs/rs-11-7-guides' into 'master'Achilleas Pipinellis2019-01-042-3/+393
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Installation/Update guides for 11.7 See merge request gitlab-org/gitlab-ce!24109
| * | | | | | | Add 11.6 to 11.7 update guidedocs/rs-11-7-guidesRobert Speicher2019-01-021-0/+390
| | | | | | | |
| * | | | | | | Update installation from source guideRobert Speicher2019-01-021-3/+3
| | | | | | | |
* | | | | | | | Merge branch '44353-improve-snippet-search-performance' into 'master'Sean McGivern2019-01-043-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant counts in snippets search Closes #44353 See merge request gitlab-org/gitlab-ce!23952
| * | | | | | | | Reduce counts in search_entries_info44353-improve-snippet-search-performanceHeinrich Lee Yu2019-01-043-3/+8
| | | | | | | | |
* | | | | | | | | Merge branch '29951-issue-creation-by-email-without-subaddressing' into 'master'Sean McGivern2019-01-0430-86/+327
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support new issue creation by email without subaddressing Closes #29951 See merge request gitlab-org/gitlab-ce!23523
| * | | | | | | | | Fix already initialized constant constant warning29951-issue-creation-by-email-without-subaddressingBrett Walker2019-01-034-4/+4
| | | | | | | | | |
| * | | | | | | | | Move constant definitionBrett Walker2019-01-034-4/+4
| | | | | | | | | |
| * | | | | | | | | Refactoring and review commentsBrett Walker2019-01-037-35/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including verifying the project_slug
| * | | | | | | | | Address review feedbackBrett Walker2019-01-032-4/+7
| | | | | | | | | |
| * | | | | | | | | Use new issue email address formatBrett Walker2019-01-0316-43/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use `-issue` in order to support catch all email addresses
| * | | | | | | | | Use new merge request email address formatBrett Walker2019-01-0315-49/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use `-merge-request` instead of `+merge-request+` in order to support catch all email addresses
| * | | | | | | | | Use new unsubscribe linkBrett Walker2019-01-034-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use `-unsubscribe` instead of `+unsubscribe` in order to support catch all email addresses
* | | | | | | | | | Merge branch 'dm-git-access-any-ce' into 'master'Sean McGivern2019-01-0414-79/+101
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Don't run checks for changed refs when specific changes are unknown See merge request gitlab-org/gitlab-ce!23990
| * | | | | | | | | Remove unnecessary double caching (in hash and request store)dm-git-access-any-ceDouwe Maan2019-01-023-21/+4
| | | | | | | | | |
| * | | | | | | | | Consider all matching MRs to determine if user can pushDouwe Maan2019-01-023-14/+24
| | | | | | | | | |
| * | | | | | | | | Move push size check to EE moduleDouwe Maan2019-01-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ee/lib/ee/gitlab/git_access.rb # lib/gitlab/git_access.rb
| * | | | | | | | | Remove oldrev and newrev nil-checks that are now unnecessaryDouwe Maan2019-01-022-2/+6
| | | | | | | | | |
| * | | | | | | | | Don't run single change checks when changes are unknownDouwe Maan2019-01-024-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `changes` passed to `GitAccess` are the literal string `_any`, which indicates that this is a pre-authorization check, we now check whether the user can push to any branch in the project in question, instead of running the per-change check with `oldrev` `_any`, `newrev` `nil`, and `ref` `nil`.
| * | | | | | | | | Skip change access check for deploy keysDouwe Maan2019-01-022-5/+4
| | | | | | | | | |
| * | | | | | | | | Extract any-branch-allows-collaboration logic into dedicated methodDouwe Maan2019-01-023-25/+35
| | | | | | | | | |
| * | | | | | | | | Move magic '_any' string to constantDouwe Maan2019-01-024-10/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-37' into 'master'Evan Read2019-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Make correction to URL, from https://about.gitab.com/handbook/documentation/... See merge request gitlab-org/gitlab-ce!24137
| * | | | | | | | | Make correction to URL, from https://about.gitab.com/handbook/documentation/ ↵carla2019-01-041-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | to https://about.gitlab.com/handbook/documentation/ (I searched to see if this is a duplicate of an existing fix, didn't find one)
* | | | | | | | | Merge branch 'gt-update-inlcude-parameter-description' into 'master'Evan Read2019-01-041-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `include` parameter usage description See merge request gitlab-org/gitlab-ce!24118