summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Move empty_repo check on its own58613-protected-branches-errorPatrick Bajao2019-03-071-1/+3
|
* Allow protected branch creation for empty projectPatrick Bajao2019-03-071-1/+1
|
* Merge branch '41888-access-personal-snippets-by-api' into 'master'Robert Speicher2019-03-061-13/+12
|\ | | | | | | | | | | | | Allow all snippets to be accessed by API Closes #41888 See merge request gitlab-org/gitlab-ce!25772
| * Allow all personal snippets to be accessed by APINick Thomas2019-03-061-13/+12
| | | | | | | | | | | | Previously, you could only access personal snippets in the API if you had authored them. The documentation doesn't state that this is the case, and it's quite surprising.
* | Adds the Rubocop ReturnNil copAndrew Newdigate2019-03-0636-46/+46
| | | | | | | | | | This style change enforces `return if ...` instead of `return nil if ...` to save maintainers a few minor review points
* | Merge branch 'api-mr-put-labels' into 'master'Sean McGivern2019-03-063-5/+29
|\ \ | | | | | | | | | | | | PUT MergeRequest API endpoint - accept labels as an array See merge request gitlab-org/gitlab-ce!19914
| * | Add array support for labelsAlexandru Croitor2019-03-063-4/+28
| | | | | | | | | | | | | | | * Support label parameter as comma separated and array of strings for merge requests and issues api endpoints
| * | PUT MergeRequest API endpoint - accept labels as an arrayMario de la Ossa2019-03-061-2/+2
| | |
* | | Allow protected branch creation via web and APIPatrick Bajao2019-03-062-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes changes to add `UserAccess#can_create_branch?` which will check whether the user is allowed to create a branch even if it matches a protected branch. This is used in `Gitlab::Checks::BranchCheck` when the branch name matches a protected branch. A `push_to_create_protected_branch` ability in `ProjectPolicy` has been added to allow Developers and above to create protected branches.
* | | Use encrypted runner tokensKamil Trzciński2019-03-061-1/+2
| | | | | | | | | | | | | | | | | | This makes code to support encrypted runner tokens. This code also finished previously started encryption process.
* | | API: delete job_artifacts of a single jobRoger Rüttimann2019-03-062-0/+20
|/ /
* | Accept force option on commit via APIPatrick Bajao2019-03-063-7/+15
| | | | | | | | | | | | | | | | When `force` is set to `true` and `start_branch` is set, the branch will be ovewritten with the new commit based on the `HEAD` of the `start_branch`. This commit includes changes to update the `gitaly-proto` gem.
* | Merge branch 'fix/gb/fix-bridge-jobs-variables-policy' into 'master'Stan Hu2019-03-051-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix bridge jobs only/except variables policy Closes #58199 See merge request gitlab-org/gitlab-ce!25710
| * | Do not raise when adding undefined variables resourceGrzegorz Bizon2019-03-021-0/+2
| | |
* | | Add metadata about the GitLab server to GraphQLNick Thomas2019-03-052-1/+39
| |/ |/|
* | Add SyntaxHighlightFilter to markup pipelineMartin Wortschack2019-03-051-1/+2
| |
* | Merge branch 'add_ldap_tls_options' into 'master'Douwe Maan2019-03-051-15/+42
|\ \ | | | | | | | | | | | | | | | | | | Allow raw `tls_options` to be passed in LDAP configuration Closes #46391 See merge request gitlab-org/gitlab-ce!20678
| * | Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2019-03-041-15/+42
| | | | | | | | | | | | | | | | | | | | | We've previously exposed ca_file and ssl_version but there are many possible options that can be used inside tls_options. Instead of exposing individual ones, simply expose the entire hash so it can be passed in and we won't have to add things in the future.
* | | Merge branch 'merge-dev-to-master' into 'master'John Jarvis2019-03-0520-68/+199
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge dev.gitlab.org master into GitLab.com master Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787 See merge request gitlab-org/gitlab-ce!25746
| * \ \ Merge dev master into GitLab.com masterYorick Peterse2019-03-0420-68/+199
| |\ \ \
| | * \ \ Merge branch 'security-commit-private-related-mr' into 'master'Yorick Peterse2019-03-041-1/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow non-members to see private related MRs Closes #2787 See merge request gitlab/gitlabhq!2866
| | | * | | Modify MergeRequestsFinder to allow filtering by commitPatrick Bajao2019-01-281-1/+7
| | | | | |
| | | * | | Respond with 403 when non-member requests for private MRsPatrick Bajao2019-01-281-0/+2
| | | | | |
| | * | | | Forbid creating discussions for users with restricted accessIgor Drozdov2019-03-041-11/+3
| | | | | |
| | * | | | Merge branch 'security-protect-private-repo-information' into 'master'Yorick Peterse2019-03-043-18/+23
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix leaking private repository information in API See merge request gitlab/gitlabhq!2881
| | | * | | | Prevent leaking of private repo data through APILuke Duncalfe2019-02-183-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default_branch, statistics and config_ci_path are now only exposed if the user has permissions to the repository.
| | * | | | | Merge branch 'security-tags-oracle' into 'master'Yorick Peterse2019-03-041-0/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Releases links API to leak tag existence Closes #2795 See merge request gitlab/gitlabhq!2893
| | | * | | | | Prevent Releases links API to leak tag existanceAlessio Caiazza2019-02-081-0/+2
| | | | | | | |
| | * | | | | | Merge branch ↵Yorick Peterse2019-03-041-9/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '2802-security-add-public-internal-groups-as-members-to-your-project-idor' into 'master' Add public/internal groups as members to your Project(IDOR) See merge request gitlab/gitlabhq!2898
| | | * | | | | | Change policy regarding group visibilityMałgorzata Ksionek2019-02-201-9/+6
| | | | | | | | |
| | * | | | | | | Merge branch 'security-kubernetes-local-ssrf' into 'master'Yorick Peterse2019-03-041-0/+8
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block local URLs for Kubernetes integration See merge request gitlab/gitlabhq!2901
| | | * | | | | | | Do not allow local urls in Kubernetes formThong Kuah2019-02-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use existing `public_url` validation to block various local urls. Note that this validation will allow local urls if the "Allow requests to the local network from hooks and services" admin setting is enabled. Block KubeClient from using local addresses It will also respect `allow_local_requests_from_hooks_and_services` so if that is enabled KubeClinet will allow local addresses
| | * | | | | | | | Merge branch 'security-osw-stop-linking-to-packages' into 'master'Yorick Peterse2019-03-0410-27/+130
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop linking to unrecognized package sources See merge request gitlab/gitlabhq!2933
| | | * | | | | | | | Raise not implemented error on BaseLinker for package_urlOswaldo Ferreira2019-02-251-0/+4
| | | | | | | | | | |
| | | * | | | | | | | Stop linking to unrecognized package sourcesOswaldo Ferreira2019-02-2110-27/+126
| | | |/ / / / / / /
| | * | | | | | | | Merge branch 'security-50334' into 'master'Yorick Peterse2019-03-041-1/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix git clone revealing private repo's presence See merge request gitlab/gitlabhq!2937
| | | * | | | | | | | Fix git clone revealing private repo's presenceMark Chao2019-02-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure redirection to path with .git suffix regardless whether project exists or not.
| | * | | | | | | | | Arbitrary file read via MergeRequestDiffFrancisco Javier López2019-03-041-0/+11
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'ce-security-jej/group-saml-link-origin-verification' into 'master'Yorick Peterse2019-03-041-1/+5
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure request to link GroupSAML acount was GitLab initiated See merge request gitlab/gitlabhq!2976
| | | * | | | | | | | | Backport EE GroupSAML origin verification changesJames Edwards-Jones2019-01-231-1/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'feature/gb/add-serverless-cicd-template' into 'master'Grzegorz Bizon2019-03-051-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify CI/CD configuration on serverless projects Closes #57405 See merge request gitlab-org/gitlab-ce!25523
| * | | | | | | | | | | Make serverless template a valid abstract templateGrzegorz Bizon2019-03-041-7/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Make it possible to easily deploy serverless functionsGrzegorz Bizon2019-03-041-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits add a job that is going to be triggered whenever someone adds `[serverless deploy-functions]` text into their commit message. This make it really simple to deploy functions in FaaS-only project.
| * | | | | | | | | | | Add Serverless CI/CD templateGrzegorz Bizon2019-03-041-0/+39
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '40396-sidekiq-in-process-group' into 'master'Stan Hu2019-03-042-2/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sidekiq: terminate child processes at shutdown See merge request gitlab-org/gitlab-ce!25669
| * | | | | | | | | | | sidekiq: terminate child processes at shutdownNick Thomas2019-03-042-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidekiq jobs frequently spawn long-lived child processes to do work. In some circumstances, these can be reparented to init when sidekiq is terminated, leading to duplication of work and strange concurrency problems. This commit changes sidekiq so that, if run as a process group leader, it will forward `INT` and `TERM` signals to the whole process group. If the memory killer is active, it will also use the process group when resorting to `kill -9` to shut down. These changes mean that a naive `kill <pid-of-sidekiq>` will now do the right thing, killing any child processes spawned by sidekiq, as long as the process supervisor placed it in its own process group. If sidekiq isn't a process group leader, this new code is skipped.
* | | | | | | | | | | | Merge branch 'resolve-some-rake-differences' into 'master'Rémy Coutable2019-03-042-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve some Rake task differences See merge request gitlab-org/gitlab-ce!25644
| * | | | | | | | | | | | Make the backup Rake task the same as in EEYorick Peterse2019-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE uses single quotes for the changed line, whereas CE was using double quotes. This commit ensures both repositories use the same kind of quotes.
| * | | | | | | | | | | | Backport EE changes to the Karma Rake taskYorick Peterse2019-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no harm in globbing for the ee/ directory, since this will effectively be a noop in CE.
* | | | | | | | | | | | | Merge branch 'sh-rugged-find-commit' into 'master'Sean McGivern2019-03-048-3/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back Rugged implementation of find_commit See merge request gitlab-org/gitlab-ce!25477
View Lorry Controller Status