summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Update `include` parameter usage description [ci skip]George Tsiolis2019-01-031-3/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sh-fix-clone-url-for-https' into 'master'Douglas Barbosa Alexandre2019-01-043-2/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clone URL not showing if protocol is HTTPS Closes #55896 See merge request gitlab-org/gitlab-ce!24131
| * | | | | | | | | | | | | | Fix clone URL not showing if protocol is HTTPSsh-fix-clone-url-for-httpsStan Hu2019-01-033-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab 11.6.2 fixed the case for HTTP. However, HTTPS still did not work because the protocol returned to `http_enabled?` was the actual protocol in use (e.g. `https` instead of `http`). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55896
* | | | | | | | | | | | | | | Merge branch '27861-add-markdown-editing-buttons-to-the-file-editor' into ↵Fatih Acet2019-01-0312-213/+421
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Add markdown editing buttons to the file editor" Closes #27861 See merge request gitlab-org/gitlab-ce!23480
| * | | | | | | | | | | | | | | Add markdown buttons to file editor27861-add-markdown-editing-buttons-to-the-file-editorSam Bigelow2019-01-0212-213/+421
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we have markdown files in many places (e.g. comments, new issues, etc.). This Merge Request detects if the file being edited is a markdown file and adds markdown buttons and their functionality to the single file editor (Not the web IDE)
* | | | | | | | | | | | | | | Merge branch 'knative-prometheus' into 'master'Kamil Trzciński2019-01-038-3/+154
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Knative metrics to Prometheus See merge request gitlab-org/gitlab-ce!23972
| * | | | | | | | | | | | | | Add Knative metrics to PrometheusChris Baumbauer2019-01-038-3/+154
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'tz-user-popover-follow-up' into 'master'Clement Ho2019-01-035-16/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Comment to user avatar Image, Changed Fixtures to created ones, added shadow color See merge request gitlab-org/gitlab-ce!23768
| * | | | | | | | | | | | | Comment user avatar Image, Changed Fixtures, added new shadow colortz-user-popover-follow-upTim Zallmann2018-12-125-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to reorder css variables Neede to reorder vars again Added Changelog
* | | | | | | | | | | | | | Merge branch '54386-integrate-mobile-css-framework-into-specific-frameworks' ↵Annabel Dunstone Gray2019-01-0314-98/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Integrate mobile CSS framework into specific frameworks Closes #54386 See merge request gitlab-org/gitlab-ce!23301
| * | | | | | | | | | | | | | Remove framework/mobile.scssTakuya Noguchi2018-12-123-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | | | | | | | | | | Move .container .title CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | | | | | | | | | | Move .container .content CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | | | | | | | | | | Integrate .nav-links li a CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | | | | | | | | | | Remove .nav-links li a CSS for mobileTakuya Noguchi2018-12-121-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | | | | | | | | | | Replace .check-all-holder with display propertiesTakuya Noguchi2018-12-122-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | | | | | | | | | | Remove .dash-projects-filters CSS for mobileTakuya Noguchi2018-12-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>