summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Allow to include files from another projectsinclude-projectKamil Trzciński2019-01-047-16/+92
| | | | This adds `project:, file:, ref:` specification support.
* Merge branch 'include-templates' into 'master'Kamil Trzciński2019-01-047-21/+121
|\ | | | | | | | | | | | | Include templates Closes #53445 See merge request gitlab-org/gitlab-ce!23495
| * Allow to include templatesKamil Trzciński2019-01-047-21/+121
| | | | | | | | | | This rewrites a syntax to allow include of templates. This also normalises the syntax used by include: feature
* | Merge branch 'bvl-dont-ignore-gitlab-pot-compat-check' into 'master'Yorick Peterse2019-01-041-1/+1
|\ \ | | | | | | | | | | | | Don't ingore the `gitlab.pot` in ee_compat_check See merge request gitlab-org/gitlab-ce!24151
| * | Don't ingore the `gitlab.pot` in ee_compat_checkBob Van Landuyt2019-01-041-1/+1
| | | | | | | | | | | | | | | | | | If there are new strings in CE, they need to be added to EE manually. As the `locale/gitlab.pot` file can't be merged automatically during the upstream merge.
* | | Add unique constraint to release and urlShinya Maeda2019-01-041-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix coding style Improve coding style Decouple UPDATE and DELETE operations of asset links Rename links_attributes to assets:links Rename exposed param and updated spec
* | | Support CURD operation for release asset linksShinya Maeda2019-01-044-2/+37
|/ / | | | | | | | | | | - Add Releases::Links model - Expose it in release API - Add integration tests
* | Merge branch ↵Kamil Trzciński2019-01-041-12/+55
|\ \ | | | | | | | | | | | | | | | | | | '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
| * | 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-041-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '29951-issue-creation-by-email-without-subaddressing' into 'master'Sean McGivern2019-01-047-27/+80
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-034-30/+35
| | | | | | | | | | | | | | | | including verifying the project_slug
| * | | Address review feedbackBrett Walker2019-01-032-4/+7
| | | |
| * | | Use new issue email address formatBrett Walker2019-01-035-13/+34
| | | | | | | | | | | | | | | | We now use `-issue` in order to support catch all email addresses
| * | | Use new merge request email address formatBrett Walker2019-01-032-20/+34
| | | | | | | | | | | | | | | | | | | | We now use `-merge-request` instead of `+merge-request+` in order to support catch all email addresses
| * | | Use new unsubscribe linkBrett Walker2019-01-032-4/+14
| | | | | | | | | | | | | | | | | | | | 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-046-27/+42
|\ \ \ \ | |/ / / |/| | | | | | | | | | | [CE] Don't run checks for changed refs when specific changes are unknown See merge request gitlab-org/gitlab-ce!23990
| * | | 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-023-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| * | | Move magic '_any' string to constantDouwe Maan2019-01-021-1/+5
| | | |
* | | | Drop Webhooks from project import/export configStan Hu2019-01-031-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Webhook URLs were recently encrypted in the database via https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21645, and as a result they are no longer exported. When an exported project with Webhooks is imported, the project import service will fail with `URI::InvalidURIError: bad URI(is not URI?)` due to a blank URL. We avoid this by disabling the export/import of Webhooks in the first place. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53513
* | | | Use reports syntax for Dependency scanning jobTetiana Chupryna2019-01-031-1/+2
| | | |
* | | | Revert changesmortyccp2019-01-031-1/+1
| | | |
* | | | Remove authentication via warden and PRIVATE_TOKEN headermortyccp2019-01-032-31/+14
| | | |
* | | | Fix lint errormortyccp2019-01-031-2/+5
| | | |
* | | | Allow basic authentication on go get middlewaremortyccp2019-01-032-17/+34
| |/ / |/| |
* | | Merge branch 'mk/avoid-extra-storage-perm-and-query' into 'master'Stan Hu2019-01-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Avoid extra storage bucket perm and query See merge request gitlab-org/gitlab-ce!23995
| * | | Avoid extra storage bucket perm and querymk/avoid-extra-storage-perm-and-queryMichael Kozono2018-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, the `ListAllMyBuckets` permission. This works if you know the directory exists. See more: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23981 * https://stackoverflow.com/a/12288581/1992201
* | | | Merge branch '18667-handle-push-opts' into 'master'Douwe Maan2019-01-025-8/+22
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Handle 'git push -o ci.skip' Closes #18667 See merge request gitlab-org/gitlab-ce!15643
| * | | Add support for Git push options, specifically ci.skipJonathon Reinhart2018-12-315-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-org/gitlab-shell!166 added support for collecting push options from the environment, and passing them along to the /internal/post_receive API endpoint. This change handles the new push_options JSON element in the payload, and passes them on through to the GitPushService and GitTagPushService services. Futhermore, it adds support for the first push option, ci.skip. With this change, one can use 'git push -o ci.skip' to skip CI pipe execution. Note that the pipeline is still created, but in the "skipped" state, just like with the 'ci skip' commit message text. Implements #18667
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-025-10/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'security-label-xss' into 'master'John Jarvis2019-01-021-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [master] Escape html entities when no label found See merge request gitlab/gitlabhq!2706
| | * | | Escape html entities when no label foundJarka Košanová2018-12-121-1/+5
| | | | |
| * | | | Merge branch 'security-master-secret-ci-variables-exposed' into 'master'John Jarvis2019-01-023-3/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [master] Secret CI variables can exposed by creating a tag with the same name as an existing protected branch See merge request gitlab/gitlabhq!2596
| | * | | | Implement Command#ambiguous_ref?Matija Čupić2018-12-082-1/+7
| | | | | |
| | * | | | Revert "Use to_s.start_with? in tag/branch ref method"Matija Čupić2018-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec4730478b798270781257913ee4cede673d4d4e.
| | * | | | Implement Repository#ambiguous_ref?Matija Čupić2018-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements Repository#ambiguous_ref? and checks if a ref is ambiguous before trying to resolve the ref in Project#protected_for?
| | * | | | Use to_s.start_with? in tag/branch ref methodMatija Čupić2018-12-081-2/+2
| | | | | |
| | * | | | Move Project#resolve_ref to RepositoryMatija Čupić2018-12-081-1/+1
| | | | | |
| | * | | | Search for tag / branch ref from beginningMatija Čupić2018-12-081-2/+2
| | | | | |
| | * | | | Allow any character in tag / branch ref regexMatija Čupić2018-12-081-2/+2
| | | | | |
| | * | | | Remove Gitlab::Git::Ref#full_refMatija Čupić2018-12-084-14/+2
| | | | | |
| | * | | | Reintroduce Command#protected_ref?Matija Čupić2018-12-085-8/+10
| | | | | |
View Lorry Controller Status