summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* 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-194-7/+7
| |
* | 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" }
* Make getting a user by the username case insensitiveWilliam George2018-10-182-2/+2
|
* [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-171-15/+38
|\ | | | | | | | | | | | | 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 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 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-152-2/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
| * | Remove Koding integration and documentationStan Hu2018-10-122-2/+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-151-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-121-2/+2
| | | | | | | | | | | | | | | | | | | | 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 '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
* | Remove Git circuit breakerZeger-Jan van de Weg2018-10-1014-747/+0
| | | | | | | | | | | | | | 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 '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 ↵Sean McGivern2018-10-051-9/+75
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '50359-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #50359 See merge request gitlab-org/gitlab-ce!21893
| * | Use a CTE to remove the query timeoutBrett Walker2018-10-051-9/+75
| | |
* | | Merge branch 'ce-5987-project-templates-api' into 'master'Robert Speicher2018-10-051-2/+9
|\ \ \ | |/ / |/| | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
| * | Backport project template API to CENick Thomas2018-10-051-2/+9
| | |
* | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-056-8/+92
|\ \ \ | | |/ | |/|
| * | Merge branch 'feature/gb/pipeline-only-except-with-modified-paths' into 'master'Kamil Trzciński2018-10-054-2/+89
| |\ \ | | |/ | |/| | | | | | | Pipeline only/except for modified paths See merge request gitlab-org/gitlab-ce!21981
| | * Merge branch 'master' into 'feature/gb/pipeline-only-except-with-modified-paths'feature/gb/pipeline-only-except-with-modified-pathsKamil Trzciński2018-10-0429-197/+490
| | |\ | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb
| | * | Add frozen strong literal directive to policy changes classGrzegorz Bizon2018-10-021-0/+2
| | | |
| | * | Freeze mutable constant in CI entry policy classGrzegorz Bizon2018-10-021-1/+1
| | | |
| | * | Match a dot in paths configured for only: changesGrzegorz Bizon2018-10-021-1/+3
| | | |
| | * | Add only/except pipeline build policy for `changes`Grzegorz Bizon2018-10-021-0/+21
| | | |
| | * | Make it possible to specifiy only: changes keywordsGrzegorz Bizon2018-10-021-2/+4
| | | |
| | * | Treat nil git push revisons as a blank Git SHA valueGrzegorz Bizon2018-10-021-2/+2
| | | |
| | * | Calculate modified paths of a git push operationGrzegorz Bizon2018-09-282-0/+18
| | | |
| | * | Add specs for extracted git push classGrzegorz Bizon2018-09-281-2/+8
| | | |
| | * | Extract git push from merge request refresh serviceGrzegorz Bizon2018-09-281-3/+14
| | | |
| | * | Add a class that represents a git push operationGrzegorz Bizon2018-09-281-0/+25
| | | |
| * | | Merge branch '52143-use-tiller-directly' into 'master'Dmitriy Zaporozhets2018-10-051-5/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tiller directly for Auto DevOps Closes #52143 See merge request gitlab-org/gitlab-ce!22076