summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade GraphQL gem to 1.8.17Brett Walker2019-09-047-11/+17
| | | | | | | | | - Due to https://github.com/exAspArk/batch-loader/pull/32, we changed BatchLoader.for into BatchLoader::GraphQL.for - since our results are wrapped in a BatchLoader::GraphQL, calling `sync` during authorization is required to get real object - `graphql` now has it's own authorization system. Our `authorized?` method conflicted and required renaming
* Merge branch 'persist-needs-error' into 'master'Grzegorz Bizon2019-09-042-2/+7
|\ | | | | | | | | Persist `needs:` validation as config error See merge request gitlab-org/gitlab-ce!32648
| * Persist `needs:` validation as config errorpersist-needs-errorKamil Trzciński2019-09-042-2/+7
| | | | | | | | | | | | | | | | In case when `needs:` is missing, but when requested by service, we would not save the pipeline with config_error. This makes it explicit that we want to persist the error as `config_error` failure reason.
* | Backport EE changes for productivity analyticsPavel Shutsin2019-09-041-0/+6
| | | | | | | | Improve diff lines count efficiency
* | Extract Workhorse <-> GitLab authentication to make it reusable61927-internal-api-jwt-authKrasimir Angelov2019-09-042-26/+44
| | | | | | | | | | | | | | Introduce JWTAutheticatable module that can be reused for ai=uthtication between Pages and GitLab (the same way we use do now for Workhorse). Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61927.
* | Improve GC_REPORT_BUCKETS granularity65509-improve-gc-report-buckets-granularityAleksei Lipniagov2019-09-031-1/+1
| |
* | Merge branch 'ce-12996-cancel-redundant-pipelines' into 'master'Lin Jen-Shin2019-09-031-1/+2
|\ \ | | | | | | | | | | | | Backport retries options for cancel_running See merge request gitlab-org/gitlab-ce!32525
| * | Backport EE issue 12996ce-12996-cancel-redundant-pipelinesSean Carroll2019-09-021-1/+2
| | |
* | | Merge branch 'an-use-labkit-correlation-id' into 'master'Ash McKenzie2019-09-032-41/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove all references to Gitlab::CorrelationId See merge request gitlab-org/gitlab-ce!32228
| * | | Remove all references to Gitlab::CorrelationIdan-use-labkit-correlation-idAndrew Newdigate2019-08-262-41/+1
| | | | | | | | | | | | | | | | This class has been replaced with Labkit::Correlation::CorrelationId
* | | | If user can push to docker then it can delete tooGiorgenes Gelatti2019-09-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends the permission of $CI_REGISTRY_USER to allow them to delete tags in addition to just pushing. https://gitlab.com/gitlab-org/gitlab-ce/issues/40096
* | | | Update Code-Quality.gitlab-ci.yml to use `only.refs`Rémy Coutable2019-09-021-2/+3
| | | | | | | | | | | | This allows overriding `only.refs` to something else if needed.
* | | | Handle :9090 and 0.0.0.0:9090 listen_address formatsReuben Pereira2019-09-021-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090. But before these can be used to connect a project to Prometheus, they have to converted into absolute URIs.
* | | | Remove reference of external examplemdhtr2019-09-021-0/+29
| |/ / |/| | | | | | | | as requested by the reviewer
* | | Fixing #65389Massimeddu Cireddu2019-09-022-1/+5
| | | | | | | | | | | | Wrong format on MS Teams integration push events with multi line commit messages
* | | Merge branch 'fix-peek-on-puma' into 'master'Rémy Coutable2019-09-024-15/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Peek on Puma Closes #66528 See merge request gitlab-org/gitlab-ce!32213
| * | | Make performance bar enabled checks consistentSean McGivern2019-08-284-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called the `peek_enabled?` method like so: prepend_before_action :set_peek_request_id, if: :peek_enabled? Now we don't have a `set_peek_request_id` method, so we don't need that line. However, the `peek_enabled?` part had a side-effect: it would also populate the request store cache for whether the performance bar was enabled for the current request or not. This commit makes that side-effect explicit, and replaces all uses of `peek_enabled?` with the more explicit `Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that still sets `SafeRequestStore[:peek_enabled]` directly, because it is contrasting behaviour with and without a request store enabled. The upshot is: 1. We still set the value in one place. We make it more explicit that that's what we're doing. 2. Reading that value uses a consistent method so it's easier to find in future.
| * | | Fix Peek on PumaSean McGivern2019-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Peek's `Peek.request_id` method doesn't work well with a multi-threaded server and concurrent requests, because requests can 'steal' another request's ID, or unset it before it was due. The upstream change resolves this; the commit here is just to ensure that GitLab works with that upstream change, mostly by not using `Peek.request_id` any more (as the method doesn't exist).
* | | | Tidy up conditional messagecharlieablett2019-09-021-5/+7
| | | |
* | | | Handle projectless `help` commands to chatopscharlieablett2019-09-021-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass in a nil project to Gitlab::SlashCommands::ApplicationHelp.new if the chatops command is help. - Modify the Gitlab::SlashCommands::Presenters::Help message to skip printing out project information.
* | | | Merge branch 'sh-fix-ci-lint-500-error' into 'master'Ash McKenzie2019-09-021-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error in CI lint when included templates are an array Closes #66605 See merge request gitlab-org/gitlab-ce!32232
| * | | | Fix 500 error in CI lint when included templates are an arraysh-fix-ci-lint-500-errorStan Hu2019-08-311-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the following syntax would fail in the linter with an error 500: ``` include: template: - License-Management.gitlab-ci.yml - Dependency-Scanning.gitlab-ci.yml - SAST.gitlab-ci.yml ``` Now the error will call out specifically that the value is not a string. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66605
* | | | | Merge branch '46686-move-k8s-services-out-of-gcp-namespace' into 'master'66783-usage-ping-for-slack-integrationsThong Kuah2019-09-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move generic k8s services out of GCP namespace See merge request gitlab-org/gitlab-ce!32310
| * | | | | Move generic k8s services out of GCP namespace46686-move-k8s-services-out-of-gcp-namespaceTiger2019-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These services aren't specific to GCP, and will be used for AWS as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/46686
* | | | | | Merge branch 'improve-chatops-help' into 'master'Nick Thomas2019-09-015-25/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve chatops help output See merge request gitlab-org/gitlab-ce!32208
| * | | | | | Improve chatops help outputimprove-chatops-helpYorick Peterse2019-08-295-25/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the output produced when running an unknown command, running the "help" command, and when trying to run a command you are not allowed to run. The new help output includes links to the project of the chatops integration, and a link to the chatops documentation.
* | | | | | | Fix for histogram corruption in SidekiqAndrew Newdigate2019-08-301-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in which sidekiq histograms contain invalid labels. See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7729 for more details.
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-2910-5/+231
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-personal-snippets' into 'master'GitLab Release Tools Bot2019-08-291-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add direct upload support for personal snippets See merge request gitlab/gitlabhq!3226
| | * | | | | | Add direct upload support for personal snippetsJan Provaznik2019-08-231-2/+5
| | | | | | | |
| * | | | | | | Merge branch 'security-fix_jira_ssrf_vulnerability' into 'master'GitLab Release Tools Bot2019-08-291-0/+66
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix DNS rebind vulnerability for JIRA integration See merge request gitlab/gitlabhq!3266
| | * | | | | | | Fix DNS rebind vulnerability for JIRA integrationFelipe Artur2019-08-081-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses Gitlab::HTTP for JIRA requests instead of Net::Http. Gitlab::Http comes with some built in SSRF protections.
| * | | | | | | | Merge branch 'security-61974-limit-issue-comment-size' into 'master'GitLab Release Tools Bot2019-08-292-1/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the size of issuable description and comments See merge request gitlab/gitlabhq!3267
| | * | | | | | | | Limit the size of issuable description and commentsAlexandru Croitor2019-08-222-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limiting the size of issuable description and comments to 1_000_000, which is close to ~1MB of ASCII characters, which represents 99.9% of all descriptions and comments we have in DB at the moment. This should help prevent DoS attacks when comments contain refference strings. Also this change updates regexp matching the namespaces paths by limiting the namespaces paths to Namespace::NUMBER_OF_ANCESTORS_ALLOWED, as we allow 20 levels deep groups. see https://gitlab.com/gitlab-org/gitlab-ce/issues/61974#note_191274234
| * | | | | | | | | Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'GitLab Release Tools Bot2019-08-293-1/+45
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require a captcha after unique failed logins from the same IP See merge request gitlab/gitlabhq!3270
| | * | | | | | | | | Add captcha if there are multiple failed login attemptsMałgorzata Ksionek2019-07-313-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method to store session ids by ip Add new specs for storing session ids Add cleaning up records after login Add retrieving anonymous sessions Add login recaptcha setting Add new setting to sessions controller Add conditions for showing captcha Add sessions controller specs Add admin settings specs for login protection Add new settings to api Add stub to devise spec Add new translation key Add cr remarks Rename class call Add cr remarks Change if-clause for consistency Add cr remarks Add code review remarks Refactor AnonymousSession class Add changelog entry Move AnonymousSession class to lib Move store unauthenticated sessions to sessions controller Move link to recaptcha info Regenerate text file Improve copy on the spam page Change action filter for storing anonymous sessions Fix rubocop offences Add code review remarks
| * | | | | | | | | | Merge branch 'security-project-import-bypass' into 'master'GitLab Release Tools Bot2019-08-291-0/+88
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project visibility restriction bypass See merge request gitlab/gitlabhq!3306
| | * | | | | | | | | | Fix project import restricted visibility bypassGeorge Koltsov2019-08-151-0/+88
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::VisibilityLevelChecker that verifies selected project visibility level (or overridden param) is not restricted when creating or importing a project
| * | | | | | | | | | Merge branch 'security-add-job-activity-limit-ce' into 'master'GitLab Release Tools Bot2019-08-291-0/+21
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce JobActivity limit for alive jobs Closes gitlab-ee#376 See merge request gitlab/gitlabhq!3339
| | * | | | | | | | | | Add active_jobs_limit to plans tableFabio Pitino2019-08-211-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a port from EE changes where we introduce a new limit for Plan model. https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/1182
| * | | | | | | | | | | Merge branch 'security-fix-markdown-xss' into 'master'GitLab Release Tools Bot2019-08-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-escape the whole HTML content when finding HTML references See merge request gitlab/gitlabhq!3340
| | * | | | | | | | | | | Re-escape whole HTML content instead of only matchJan Provaznik2019-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we un-escape HTML text to find references in it, we should then re-escape the whole text again, not only found matches. Because we replace matches with milestone/label links (which contain HTML tags we don't want to escape again), we re-escape HTML text with placeholders instead of these links and then replace placeholders in the escaped text.
* | | | | | | | | | | | | Add a close issue slack slash commandSarah Yasonik2019-08-295-9/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a slash command in slach for closing issues. See https://docs.gitlab.com/ee/integration/slash_commands.html for documentation on the wider feature set.
* | | | | | | | | | | | | Revert "Cache branch and tag names as Redis sets"Nick Thomas2019-08-292-120/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0eff75fa2b6691b6fba31fcc2842f51debd249a9.
* | | | | | | | | | | | | Auto create authorized_keys file if doesn't exist60071-remove-gitlab-keys-usagePatrick Bajao2019-08-291-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Utilize the auto repair functionality of system checks.
* | | | | | | | | | | | | Add system check for authorized_keys file permPatrick Bajao2019-08-291-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This check is being removed from gitlab-shell as the file is now being managed by gitlab-rails.
* | | | | | | | | | | | | Remove the fallback path from gitlab-cePatrick Bajao2019-08-291-80/+6
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mk/simplify-internal-post-receive-messages' into 'master'Grzegorz Bizon2019-08-291-0/+51
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify internal post receive messages Closes #59808 See merge request gitlab-org/gitlab-ce!31640
| * | | | | | | | | | | | Simplify internal post receive messagesmk/simplify-internal-post-receive-messagesMichael Kozono2019-08-281-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of sending varied data to Gitaly, and making Gitaly construct various messages, build the messages first and have Gitaly print either basic messages or alert messages, in the order they come. Depends on https://gitlab.com/gitlab-org/gitaly/merge_requests/1410
* | | | | | | | | | | | | Merge branch 'performance-bar-warnings' into 'master'Stan Hu2019-08-291-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add warnings to performance bar response See merge request gitlab-org/gitlab-ce!31054