summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Avoid calling freeze on already frozen strings in libDinesh Panda2019-09-1018-31/+31
|
* Merge branch 'issue-67127' into 'master'Ash McKenzie2019-09-101-0/+4
|\ | | | | | | | | Expose :protected field for ../tags/:tag_name API endpoint See merge request gitlab-org/gitlab-ce!32790
| * Fix after 'static-analysis' job failAndrea Leone2019-09-071-1/+0
| |
| * Expose :protected field for ../tags/:tag_name API endpointAndrea Leone2019-09-071-0/+5
| |
* | Merge branch 'api_settings' into 'master'Douglas Barbosa Alexandre2019-09-091-5/+3
|\ \ | | | | | | | | | | | | | | | | | | Improve application settings API Closes #58180 See merge request gitlab-org/gitlab-ce!31149
| * | Settings API: domain_{black,white}list should be arraysMathieu Parent2019-09-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | As in documentation. Fixes: #58180. Also remove the requirement between domain_blacklist_enabled and domain_blacklist.
| * | App settings: Allow all import sources from APIMathieu Parent2019-09-091-1/+1
| | |
* | | Improve performance and memory usage of project exportKamil Trzciński2019-09-094-2/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel::Serialization is simple in that it recursively calls `as_json` on each object to serialize everything. However, for a model like a Project, this can generate a query for every single association, which can add up to tens of thousands of queries and lead to memory bloat. To improve this, we can do several things: 1. We use `tree:` and `preload:` to automatically generate a list of all preloads that could be used to serialize objects in bulk. 2. We observe that a single project has many issues, merge requests, etc. Instead of serializing everything at once, which could lead to database timeouts and high memory usage, we take each top-level association and serialize the data in batches. For example, we serialize the first 100 issues and preload all of their associated events, notes, etc. before moving onto the next batch. When we're done, we serialize merge requests in the same way. We repeat this pattern for the remaining associations specified in import_export.yml.
* | | Lower searches count limitFrancisco Javier López2019-09-091-2/+3
| | | | | | | | | | | | | | | Lowering the limit when performing search from 1001 to 101. This will allow us to speed this process.
* | | Merge branch '61927-skeleton-pages-internal-api' into 'master'Kamil Trzciński2019-09-093-1/+44
|\ \ \ | | | | | | | | | | | | | | | | Add skeleton Pages internal API See merge request gitlab-org/gitlab-ce!32732
| * | | Add skeleton Pages internal API61927-skeleton-pages-internal-apiKrasimir Angelov2019-09-063-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Basic `/internal/pages` endpoint that will be used for Pages virtual domains internal API. The endpoint is currently behind feature flag and provides authetication similar to how Workhorse is authenticating with the GitLab.
* | | | Passing job:rules downstream and E2E specs for job:rules configurationdrew2019-09-096-6/+24
| |/ / |/| |
* | | Merge branch 'reduce-parse-options-complexity' into 'master'Ash McKenzie2019-09-091-8/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor parse_options() in push_options.rb Closes #67091 See merge request gitlab-org/gitlab-ce!32756
| * | | Refactor parse_options() in push_options.rbreduce-parse-options-complexityChristian Couder2019-09-071-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | This improves code quality by reducing Cognitive Complexity. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/67091
* | | | Application Statistics APIManoj MJ2019-09-093-0/+68
| | | | | | | | | | | | | | | | | | | | This change implements Application Statistics API
* | | | Merge branch 'kamil-refactor-import-structure' into 'master'Stan Hu2019-09-087-351/+198
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Normalize import_export structure See merge request gitlab-org/gitlab-ce!32704
| * | | Normalize import_export structurekamil-refactor-import-structureKamil Trzciński2019-09-067-351/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings a significant refactor to how we handle `import_export.yml`, merge it with EE and how we handle that for reader and saver. This is meant to simplify the code, and remove a ton of conditions to handle different models of the structure. This is also meant to prepare the structure to extend it much easier, like adding `preload:` or additional object types when needed. This does not change the behavior of import/export, rather unifies and simplifies the current implementation.
* | | | Only show `/copy_metadata` when usableLee Tickett2019-09-061-1/+1
| | | |
* | | | Process workhorse accelerated wiki uploadsAlessio Caiazza2019-09-063-8/+52
| | | | | | | | | | | | | | | | | | | | Wiki attachments can be workhorse accelerated. This commit is backward compatible with older workhorse
* | | | Add new GitlabDanger classAsh McKenzie2019-09-063-1/+81
|/ / / | | | | | | | | | This class encapsulates our use of the Danger gem.
* | | Merge branch 'ce-detect-github-pull-requests' into 'master'Kamil Trzciński2019-09-063-1/+4
|\ \ \ | |/ / |/| | | | | | | | Port CreateGithubPullRequestEvents migration from EE See merge request gitlab-org/gitlab-ce!31802
| * | CE port for pipelines for external pull requestsce-detect-github-pull-requestsFabio Pitino2019-09-053-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect if pipeline runs for a GitHub pull request When using a mirror for CI/CD only we register a pull_request webhook. When a pull_request webhook is received, if the source branch SHA matches the actual head of the branch in the repository we create immediately a new pipeline for the external pull request. Otherwise we store the pull request info for when the push webhook is received. When using "only/except: external_pull_requests" we can detect if the pipeline has a open pull request on GitHub and create or not the job based on that.
* | | Stop empty external auth classification labels overriding default labelsWill Chandler2019-09-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the project templates bundled with GitLab have an empty string set for `external_authorization_classification_label` in their `project.json`. When imported this overrides the default label set on the instance, causing the label to appear empty. This change sets empty labels to nil during import, allowing the default label to override it and be applied to the project.
* | | Merge branch 'revert-351d72cb' into 'master'Lin Jen-Shin2019-09-063-76/+1
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'" See merge request gitlab-org/gitlab-ce!32741
| * | | Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'"revert-351d72cbAsh McKenzie2019-09-063-76/+1
| | | | | | | | | | | | This reverts merge request !32196
* | | | Merge branch ↵Jan Provaznik2019-09-061-0/+35
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | '59729-estimate-quick-action-does-not-produce-correct-time-for-1mo' into 'master' Resolve "estimate quick action does not produce correct time for 1mo" See merge request gitlab-org/gitlab-ce!32165
| * | | Fix time tracking parsing of months59729-estimate-quick-action-does-not-produce-correct-time-for-1moHeinrich Lee Yu2019-09-051-0/+35
| | | | | | | | | | | | | | | | | | | | Patches ChronicDuration to use our custom conversions when parsing months
* | | | Merge branch '66596-allow-danger-to-be-run-locally' into 'master'Lin Jen-Shin2019-09-063-1/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Break up Danger rules into local or CI only See merge request gitlab-org/gitlab-ce!32196
| * | | | Add new danger_local Rake taskAsh McKenzie2019-09-061-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The benefit of running the danger_local Rake task is that it displays some informational messages for clarity and also exits with 1 if there's any output.
| * | | | Add new GitlabDanger classAsh McKenzie2019-09-061-0/+54
| | | | | | | | | | | | | | | | | | | | This class encapsulates our use of the Danger gem.
| * | | | Allow Danger to detect if running localAsh McKenzie2019-09-061-1/+5
| | |_|/ | |/| |
* | | | Merge branch 'add-label-push-opts' into 'master'Ash McKenzie2019-09-061-2/+19
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Support adding and removing labels w/ push opts Closes #5942 See merge request gitlab-org/gitlab-ce!31831
| * | | Support adding and removing labels w/ push optsChristian Couder2019-09-041-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow adding and removing labels to a merge request using git push options. To create a new merge request and add 2 labels to it: git push -u origin -o merge_request.create \ -o merge_request.label="My label 1" \ -o merge_request.label="My label 2" To update an existing merge request and remove a label while adding a different label: git push -u origin -o merge_request.label="My added label" \ -o merge_request.unlabel="My removed label" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | Merge branch 'danger-review-pipeline' into 'master'Rémy Coutable2019-09-052-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Danger Roulette rules for pipeline files See merge request gitlab-org/gitlab-ce!32616
| * | | | Add Danger Roulette rules for pipeline filesdanger-review-pipelineKyle Wiebers2019-09-052-2/+6
| | | | |
* | | | | Merge branch '67037-user-content-gitlab-static-net-brings-back-404-only' ↵Sean McGivern2019-09-051-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "user-content.gitlab-static.net brings back 404 only" See merge request gitlab-org/gitlab-ce!32703
| * | | | | Set asset_proxy_whitelist default to gitlab host67037-user-content-gitlab-static-net-brings-back-404-onlyBrett Walker2019-09-051-1/+5
| |/ / / /
* | | | | New interruptible attribute supported in YAML parsing.Cédric Tabin2019-09-052-3/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Since it is not possible to dynamically detect if a job is automatically cancellable or not, a this new attribute is necessary. Moreover, it let the maintainer of the repo to adjust the behaviour of the auto cancellation feature to match exactly what he needs.
* | | | Merge branch 'ashmckenzie/provide_gl-type_to_gitlab_shell' into 'master'Nick Thomas2019-09-053-29/+60
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Extract /internal/allowed API Actor logic out See merge request gitlab-org/gitlab-ce!31564
| * | | Extract /internal/allowed API Actor logic outashmckenzie/provide_gl-type_to_gitlab_shellAsh McKenzie2019-09-053-29/+60
| | | | | | | | | | | | | | | | | | | | | | | | Created new API::Support::GitAccessActor class to encapsulate some of the more edge logic, making the /internal/allowed route much cleaner.
* | | | Refactor new undo_* methodsReuben Pereira2019-09-051-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | - Move code for creating a new column from old into a function so that it can be reused. - Also add comments above the methods.
* | | | Merge branch ↵Peter Leitzen2019-09-051-3/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '66150-remove-dynamically-constructed-feature-flags-starting-with-prometheus_transaction_' into 'master' Resolve "Remove dynamically constructed feature flags starting with `prometheus_transaction_`" Closes #66150 See merge request gitlab-org/gitlab-ce!32395
| * | | Remove feature flags starting with `prometheus_transaction_`Jacopo2019-09-051-3/+2
| | | | | | | | | | | | | | | | Those feature flags were always enabled so we can remove them safely.
* | | | Add .gitlab/ci/frontend.gitlab-ci.yml to frontend review rouletteWinnie Hellmann2019-09-051-1/+2
|/ / /
* | | Merge branch 'remove-unnecessary-freeze-in-lib-gitlab' into 'master'Jan Provaznik2019-09-0561-117/+119
|\ \ \ | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in lib/gitlab See merge request gitlab-org/gitlab-ce!32637
| * | | Avoid calling freeze on already frozen strings in lib/gitlabdineshpanda2019-09-0461-117/+119
| | | |
* | | | Add spaces to devops ci template to reduce warningsMarcel Amirault2019-09-051-11/+11
| | | |
* | | | Allow not resolvable urls when rebinding setting is disabledFrancisco Javier López2019-09-051-2/+6
| |/ / |/| | | | | | | | | | | Now, when the dns rebinging setting is disabled, we will allow urls that are not resolvable.
* | | Upgrade graphql gem to 1.9.10Brett Walker2019-09-043-2/+6
| | | | | | | | | | | | | | | | | | - `edge_nodes` needs to get called on the object - added `include GlobalID::Identification` in a couple places - renamed `object` to `item` in spec due to conflict
* | | Show meaningful message on /due quick action with invalid date🙈 jacopo beschi 🙉2019-09-041-1/+5
| | | | | | | | | | | | | | | When using /due quick action with an invalid date a meaninful error message is shown.