summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
|\ \
| * \ Merge branch 'security-bw-confidential-titles-through-markdown-api' into ↵Bob Van Landuyt2018-10-052-4/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [master] Confidential issue/private snippet titles can be read by unauthenticated user through GFM markdown API Closes #2706 See merge request gitlab/gitlabhq!2507
| | * | post_process markdown redered by APIBrett Walker2018-09-292-4/+10
| | | |
| * | | Merge branch 'security-fix-leaking-private-project-namespace' into 'master'Bob Van Landuyt2018-10-052-1/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix leaking private project namespace Closes #2708 See merge request gitlab/gitlabhq!2529
| | * | | Filter system notes with public and private cross referencesBrett Walker2018-10-022-1/+8
| | | | |
* | | | | 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-055-7/+74
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
| * | | | | Backport project template API to CENick Thomas2018-10-055-7/+74
| | | | | |
* | | | | | Merge branch 'scheduled-manual-jobs' into 'master'Kamil Trzciński2018-10-0512-7/+157
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767
| * \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0510-13/+102
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-057-7/+16
| |\ \ \ \ \ \ \
| * | | | | | | | Add limitation for start_in keywordShinya Maeda2018-10-043-1/+16
| | | | | | | | |
| * | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0413-135/+108
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-034-1/+95
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename failure reason to stale_scheduleShinya Maeda2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Add scheduled statusShinya Maeda2018-10-023-1/+23
| | | | | | | | | | |
| * | | | | | | | | | Add unschedule action to status buildShinya Maeda2018-10-022-0/+42
| | | | | | | | | | |
| * | | | | | | | | | Fix coding style offenceShinya Maeda2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use correct icon for scheduled jobs in pipeline graphWinnie Hellmann2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Allow remaining time of scheduled jobs to overflow one dayWinnie Hellmann2018-10-021-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix URL to empty state graphic of scheduled jobsWinnie Hellmann2018-10-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix Status::Build::Scheduled. Add spec for the class.Shinya Maeda2018-10-021-1/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix validation methods in Config::Entry::Job. Added spec for thatShinya Maeda2018-10-021-9/+4
| | | | | | | | | | |
| * | | | | | | | | | Add schedule_expired to failed statusShinya Maeda2018-10-021-1/+2
| | | | | | | | | | |