summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'use-raw-file-format' into 'master'Grzegorz Bizon2018-10-223-46/+75
|\ | | | | | | | | | | | | Add RAW file format which is used to store security reports Closes gitlab-ee#7996 See merge request gitlab-org/gitlab-ce!22365
| * Make all legacy security reports to use raw formatuse-raw-file-formatKamil Trzciński2018-10-163-46/+75
| | | | | | | | | | | | | | | | | | - This introduces and uses `:raw` format for all legacy reports, the ones that do not have yet proper parsers on Backend - Raw format is needed to make Frontend be able to parse reports, without the need of decompressing, - This also extends fixtures to seed security reports with database, even though parser code is part of EE
* | Enable frozen string for lib/gitlab/*.rbgfyoung2018-10-22150-22/+322
| |
* | Merge branch 'ce-5987-group-file-templates' into 'master'Robert Speicher2018-10-191-1/+1
|\ \ | | | | | | | | | | | | CE backport of changes to suppport group file templates See merge request gitlab-org/gitlab-ce!22310
| * | Backport CE to changes to support group-level file templatesNick Thomas2018-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | When the feature is available, this setting allows admins to choose a project as a source of custom file templates. This is in addition to any instance-wide templates, whether custom or vendored into the GitLab codebase.
* | | Rename "scheduled" label/badge of delayed jobs to "delayed"Shinya Maeda2018-10-195-8/+8
| | |
* | | Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
| * | | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* | | Catch `RedirectionTooDeep` Exception in webhooksHeinrich Lee Yu2018-10-191-0/+7
| |/ |/|
* | Add support for JSON logging for audit eventsStan Hu2018-10-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will add audit_json.log that writes one line per audit event. For example: { "severity":"INFO", "time":"2018-10-17T17:38:22.523Z", "author_id":3, "entity_id":2, "entity_type":"Project", "change":"visibility", "from":"Private", "to":"Public", "author_name":"John Doe4", "target_id":2, "target_type":"Project", "target_details":"namespace2/project2" }
* | Merge branch 'bw-fix-hamllint' into 'master'Robert Speicher2018-10-181-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Multiple spring rake commands cause "NameError: uninitialized constant HamlLint::Linter" Closes #52843 See merge request gitlab-org/gitlab-ce!22437
| * | Fix uninitialized constant HamlLint::LinterBrett Walker2018-10-171-3/+3
| | | | | | | | | | | | | | | | | | Running multiple `rake` commands with `spring', such as `spring rake db:rollback` could cause a `NameError: uninitialized constant HamlLint::Linter`
* | | Make getting a user by the username case insensitiveWilliam George2018-10-187-21/+13
|/ /
* | [ci skip] Fix documentation of Gitlab::Git::Diff#filter_diff_options flagsAlejandro Rodríguez2018-10-171-1/+1
| |
* | Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-173-15/+250
|\ \ | | | | | | | | | | | | | | | | | | Remove gitlab-grit as a transitive dependency of GitLab Closes #44361 See merge request gitlab-org/gitlab-ce!22373
| * | Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-gritNick Thomas2018-10-161-10/+14
| | | | | | | | | | | | | | | | | | Inlining this code allows us to remove a dependency on gitlab_grit in gitlab-ce. We can't stop maintaining gitlab_grit yet, since gitaly-ruby still depends on this gem, but it moves us a step closer.
| * | Remove explicit requires from flowdockNick Thomas2018-10-162-5/+0
| | |
| * | Remove a dependency on gitlab-gollum-libNick Thomas2018-10-161-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | Removing this dependency also allows us to remove a transitive dependency on gitlab_grit - which is the whole point of this exercise. I don't think we can EOL gitlab_grit until it's removed as a dependency from gitaly-ruby, but this at least gets it out of gitlab-ce.
| * | Merge flowdock monkeypatch into the inlined gemNick Thomas2018-10-162-53/+23
| | |
| * | Rubocop improvementsNick Thomas2018-10-162-29/+30
| | |
| * | Inline the gitlab-flowdock-git-hooks gemNick Thomas2018-10-162-0/+246
| | | | | | | | | | | | | | | This allows us to avoid one transitive dependency on gitlab-grit. The aim is to remove all transitive dependencies.
* | | Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ↵Douwe Maan2018-10-161-0/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 'master' Resolve "Webhook Image URLs Rewritten Incorrectly in Issues" Closes #52650 See merge request gitlab-org/gitlab-ce!22361
| * | Fix image webhook rewriting for uploadsSean McGivern2018-10-161-0/+11
| |/ | | | | | | | | | | | | This rewrote URLs to be absolute URLs. However, for uploads (the most common case), we actually need them to point to not just the GitLab instance, but the project they're from. Thankfully, we can normally get that information from the object we're building the hook for.
* | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-153-6/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
| * | Remove Koding integration and documentationStan Hu2018-10-123-6/+0
| | | | | | | | | | | | | | | | | | This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
* | | Merge branch 'bvl-merge-base-multiple-revisions' into 'master'Douwe Maan2018-10-152-9/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow getting the merge base of multiple revisions Closes #52573 See merge request gitlab-org/gitlab-ce!22295
| * | | Allow getting the merge base of multiple revisionsBob Van Landuyt2018-10-122-9/+4
| | | | | | | | | | | | | | | | | | | | As we now support getting the merge base for multiple revisions in gitaly, we can provide this functionality in our API
* | | | Merge branch 'zj-remove-linguist' into 'master'Robert Speicher2018-10-155-39/+182
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Remove dependencies on Linguist Closes #35450 See merge request gitlab-org/gitlab-ce!21008
| * | | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-125-39/+182
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
* | | Merge branch 'enable-frozen-string-lib-gitlab' into 'master'Rémy Coutable2018-10-1553-3/+115
|\ \ \ | | | | | | | | | | | | | | | | Enable some frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22304
| * | | Enable some frozen string in lib/gitlabgfyoung2018-10-1353-3/+115
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string for the following files: * lib/gitlab/auth/**/*.rb * lib/gitlab/badge/**/*.rb * lib/gitlab/bare_repository_import/**/*.rb * lib/gitlab/bitbucket_import/**/*.rb * lib/gitlab/bitbucket_server_import/**/*.rb * lib/gitlab/cache/**/*.rb * lib/gitlab/checks/**/*.rb Partially addresses #47424.
* | | Merge branch '52421-show-canary-no-canary-in-the-performance-bar' into 'master'Sean McGivern2018-10-151-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Show canary / no-canary in the performance bar" Closes #52421 See merge request gitlab-org/gitlab-ce!22222
| * | | Show if the host is a canary host in the perf barSean McGivern2018-10-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the request came from a canary host, show this in the performance bar by: 1. Adding a bird emoji. 2. Colouring the hostname yellow.
* | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-10-151-20/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Android.gitlab-ci.yml for current stable SDK See merge request gitlab-org/gitlab-ce!22336
| * | | | Update Android.gitlab-ci.yml for current stable SDKOsama Bin Omar2018-10-131-20/+20
| | |/ / | |/| |
* | | | fix duplicated key in license management job gitlab-org/gitlab-ce#52609Adam Lemanski2018-10-121-2/+2
|/ / /
* | | Merge branch 'frontend-feature-flags' into 'master'Rémy Coutable2018-10-111-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support pushing of feature flags to the frontend Closes gitlab-org/release/framework#17 See merge request gitlab-org/gitlab-ce!22197
| * | | Support pushing of feature flags to the frontendYorick Peterse2018-10-111-0/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a method to Gitlab::GonHelper called `push_frontend_feature_flag`. This method can be used to easily expose the state of a feature flag to Javascript code. For example, using this method we may write the following controller code: before_action do push_frontend_feature_flag(:vim_bindings) end def index # ... end def edit # ... end In Javascript we can then check the state of the flag as follows: if ( gon.features.vimBindings ) { // ... } Fixes https://gitlab.com/gitlab-org/release/framework/issues/17
* | | Merge branch 'even-more-frozen-string-lib' into 'master'Rémy Coutable2018-10-1156-3/+116
|\ \ \ | |_|/ |/| | | | | | | | Enable even more frozen string in lib/**/*.rb See merge request gitlab-org/gitlab-ce!22206
| * | Enable even more frozen string in lib/**/*.rbgfyoung2018-10-0856-3/+116
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following files: * lib/generators/**/*.rb * lib/gitaly/**/*.rb * lib/google_api/**/*.rb * lib/haml_lint/**/*.rb * lib/json_web_token/**/*.rb * lib/mattermost/**/*.rb * lib/microsoft_teams/**/*.rb * lib/object_storage/**/*.rb * lib/omni_auth/**/*.rb * lib/peek/**/*.rb * lib/rouge/**/*.rb * lib/rspec_flaky/**/*.rb * lib/system_check/**/*.rb Partially addresses #47424.
* | Remove Git circuit breakerZeger-Jan van de Weg2018-10-1016-768/+2
| | | | | | | | | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* | Use the standard PIP_CACHE_DIR for Python dependency caching templateTakuya Noguchi2018-10-091-1/+1
|/ | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Merge branch 'more-frozen-string-enable-lib' into 'master'Rémy Coutable2018-10-08102-5/+212
|\ | | | | | | | | Enable more frozen string in lib/**/*.rb See merge request gitlab-org/gitlab-ce!22174
| * Enable more frozen string in lib/**/*.rbgfyoung2018-10-06102-5/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen for the following: * lib/*.rb * lib/banzai/**/*.rb * lib/bitbucket/**/*.rb * lib/constraints/**/*.rb * lib/container_registry/**/*.rb * lib/declarative_policy/**/*.rb Partially addresses #47424.
* | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-10-081-3/+6
|\ \ | |/ |/| | | | | Updates Laravel.gitlab-ci.yml template See merge request gitlab-org/gitlab-ce!22167
| * Updates Laravel.gitlab-ci.yml templatePaul Giberson2018-10-061-3/+6
| | | | | | | | | | Updates to add gnupgp (required for node setup) Upgrades node install to version 8
* | Merge branch 'backport-ce-to-ee-merge' into 'master'Stan Hu2018-10-061-1/+1
|\ \ | |/ |/| | | | | Backport of CE upstream - 2018-10-05 12:21 UTC See merge request gitlab-org/gitlab-ce!22154
| * Fix CE to EE merge (backport)Kamil Trzciński2018-10-051-1/+1
| |
* | Add timed incremental rollout to Auto DevOpsAlessio Caiazza2018-10-051-31/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | Auto DevOps deployment strategies now supports timed incremental rollout. We are deprecating the usage of INCREMENTAL_ROLLOUT_ENABLED environment variable in Auto DevOps template. The new behavior will be driven by the INCREMENTAL_ROLLOUT_MODE variable that can either be manual (same as INCREMENTAL_ROLLOUT_ENABLED) or timed. Rollout deployments will be executed using a 5 minute delay between each job.
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-054-5/+18
|\ \