summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Clear BatchLoader context between Sidekiq jobsDouwe Maan2018-11-221-0/+13
|
* Merge branch 'revert-fd6e3781' into 'master'Sean McGivern2018-11-223-128/+14
|\ | | | | | | | | | | | | Revert "Merge branch 'revert-e2aa2177' into 'master'" Closes #54267 See merge request gitlab-org/gitlab-ce!23237
| * Fix bug where ID is not setrevert-fd6e3781Zeger-Jan van de Weg2018-11-201-5/+4
| | | | | | | | | | On HEAD~ we remove the ID from the class, which created a bug. Given we don't need the ID anymore, it has been removed and simplified.
| * Revert "Merge branch 'revert-e2aa2177' into 'master'"Zeger-Jan van de Weg2018-11-203-123/+10
| | | | | | This reverts merge request !23229
* | Fix typo in scheduled pipelinesDavy Defaud2018-11-221-1/+1
| |
* | Eliminate duplicated wordsTakuya Noguchi2018-11-224-7/+7
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch '49565-ssh-push-mirroring' into 'master'Robert Speicher2018-11-203-6/+21
|\ \ | | | | | | | | | | | | | | | | | | SSH public-key authentication for push mirroring Closes #49565 See merge request gitlab-org/gitlab-ce!22982
| * | SSH public-key authentication for push mirroringNick Thomas2018-11-193-6/+21
| | |
* | | Merge branch 'frozen-string-lib-gitlab-even-even-even-more' into 'master'Rémy Coutable2018-11-20101-9/+212
|\ \ \ | |_|/ |/| | | | | | | | Enable even more frozen string for lib/gitlab See merge request gitlab-org/gitlab-ce!23225
| * | Enable even more frozen string for lib/gitlabgfyoung2018-11-19101-9/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/patch/**/*.rb * lib/gitlab/popen/**/*.rb * lib/gitlab/profiler/**/*.rb * lib/gitlab/project_authorizations/**/*.rb * lib/gitlab/prometheus/**/*.rb * lib/gitlab/query_limiting/**/*.rb * lib/gitlab/quick_actions/**/*.rb * lib/gitlab/redis/**/*.rb * lib/gitlab/request_profiler/**/*.rb * lib/gitlab/search/**/*.rb * lib/gitlab/sherlock/**/*.rb * lib/gitlab/sidekiq_middleware/**/*.rb * lib/gitlab/slash_commands/**/*.rb * lib/gitlab/sql/**/*.rb * lib/gitlab/template/**/*.rb * lib/gitlab/testing/**/*.rb * lib/gitlab/utils/**/*.rb * lib/gitlab/webpack/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424.
* | | Merge branch 'revert-e2aa2177' into 'master'Sean McGivern2018-11-203-10/+123
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'" See merge request gitlab-org/gitlab-ce!23229
| * | | Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"revert-e2aa2177Sean McGivern2018-11-203-10/+123
| | | | | | | | | | | | This reverts merge request !23140
* | | | Merge branch 'fix/allow-saml2-for-2fa-bypass' into 'master'Douwe Maan2018-11-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses See merge request gitlab-org/gitlab-ce!22568
| * | | | saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses1151002018-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ce/#53102.
* | | | | Merge branch '3062-improve-project-cache' into 'master'Douwe Maan2018-11-202-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Change project cache key to depend on ID instead of full path Closes #42191 See merge request gitlab-org/gitlab-ce!23135
| * | | | Change project pipeline status cache key to follow project conventionGabriel Mazetto2018-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old cache key was: `projects/#{id}/pipeline_status/#{sha}` New one is: `project:#{id}:pipeline_status:#{sha}` This allows to delete any project related key just by scanning for: `project:#{id}`.
| * | | | Change project cache key to depend on ID instead of full pathGabriel Mazetto2018-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, project cache used as part of the namespace the `full_path`, which included namespace and project slug. That meant that anytime a project was renamed or transfered to a different namespace, we would lose the existing cache. This is not necessary, nor desired. I've prefixed cache key with `project:` to make it easy to find in redis if necessary as well as make it possible to purge all project related cache. I've also switched the cache key type to go after the initial namespace and not before.
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSteve Azzopardi2018-11-201-0/+2
|\ \ \ \ \
| * | | | | Prevent templated services from being importedStan Hu2018-11-191-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Templated services should only be created by admins and does not apply to project import/export. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54189
* | | | | Merge branch 'zj-improve-gitaly-pb' into 'master'Sean McGivern2018-11-203-123/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Show what RPC is called in the performance bar See merge request gitlab-org/gitlab-ce!23140
| * | | | Show what RPC is called in the performance barZeger-Jan van de Weg2018-11-163-123/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Now only the data was shown of the service, which is not valueable at times given some of those expose a lot of RPCs.
* | | | | Merge branch 'frozen-string-lib-gitlab-even-even-more' into 'master'Stan Hu2018-11-20102-3/+208
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable even more frozen string for lib/gitlab See merge request gitlab-org/gitlab-ce!23161
| * | | | | Enable even more frozen string for lib/gitlabgfyoung2018-11-16102-3/+208
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/hook_data/**/*.rb * lib/gitlab/i18n/**/*.rb * lib/gitlab/import/**/*.rb * lib/gitlab/import_export/**/*.rb * lib/gitlab/kubernetes/**/*.rb * lib/gitlab/legacy_github_import/**/*.rb * lib/gitlab/manifest_import/**/*.rb * lib/gitlab/metrics/**/*.rb * lib/gitlab/middleware/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424.
* | | | | Merge branch '54046-fix-by-any-email-for-private-commit-emails' into 'master'Douwe Maan2018-11-191-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match users better by their private commit email Closes #54046 See merge request gitlab-org/gitlab-ce!23080
| * | | | | Match users better by their private commit emailNick Thomas2018-11-191-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Private commit emails were introduced in !22560, but some parts of GitLab were not updated to take account of them. This commit adds support in places that were missed.
* | | | | Merge branch 'improve-variables-support' into 'master'Sean McGivern2018-11-191-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Improve variables support See merge request gitlab-org/gitlab-ce!23077
| * | | | Improve variables supportimprove-variables-supportKamil Trzciński2018-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that variables accept only string, alongside also improves kubernetes_namespace, improving validation and default value being set.
* | | | | Auto DevOps support for Group Security DashboardFabio Busatto2018-11-191-0/+32
| |/ / / |/| | |
* | | | Merge branch '49726-upgrade-helm-to-2-11' into 'master'Kamil Trzciński2018-11-164-17/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrade Helm Tiller Version Used By GitLab Managed Apps" Closes #49726 See merge request gitlab-org/gitlab-ce!22693
| * | | | Remove unnecessary --tiller-namespace49726-upgrade-helm-to-2-11Dylan Griffith2018-11-161-1/+1
| | | | |
| * | | | Use helm version loop instead of sleep in ClientCommandDylan Griffith2018-11-161-1/+1
| | | | |
| * | | | Extract Helm::ClientCommand for shared commandsDylan Griffith2018-11-163-32/+30
| | | | |
| * | | | Upgrade helm to 2.11.0 and upgrade on every installDylan Griffith2018-11-163-3/+19
| | | | |
* | | | | Merge branch ↵Steve Azzopardi2018-11-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54011-all-files-named-index-have-their-content-rendered-as-if-they-were-text-files' into 'master' Resolve "All files named `index.*` have their content rendered as if they were text files" Closes #54011 See merge request gitlab-org/gitlab-ce!23063
| * | | | | Fix rubocop warning54011-all-files-named-index-have-their-content-rendered-as-if-they-were-text-filesJames Lopez2018-11-161-1/+1
| | | | | |
| * | | | | Remove redundant end anchorsJames Lopez2018-11-161-1/+1
| | | | | |
| * | | | | Update regex to use unionJames Lopez2018-11-161-1/+1
| | | | | |
| * | | | | Fix text rendering of readme/indexJames Lopez2018-11-141-1/+1
| | | | | |
* | | | | | Merge branch 'sh-use-nokogiri-xml-backend' into 'master'Kamil Trzciński2018-11-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Nokogiri as the ActiveSupport XML backend Closes #54068 See merge request gitlab-org/gitlab-ce!23136
| * | | | | | Use Nokogiri as the ActiveSupport XML backendsh-use-nokogiri-xml-backendStan Hu2018-11-161-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This significantly improves performance and reduces memory consumption when parsing XML files. On a test with 124 JUnit files from a CE build, there was about a 4x reduction in processing time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54068
* | | | | | Merge branch 'allow-to-use-glob-for-ci-changes-detection' into 'master'Grzegorz Bizon2018-11-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add glob for CI changes detection See merge request gitlab-org/gitlab-ce!23128
| * | | | | | Add glob for CI changes detectionKirill Zaitsev2018-11-151-1/+1
| | | | | | |
* | | | | | | Merge branch 'gt-fix-typos-in-lib' into 'master'Sean McGivern2018-11-163-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in lib See merge request gitlab-org/gitlab-ce!23106
| * | | | | | | Fix typos in libGeorge Tsiolis2018-11-153-9/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fj-fix-bug-commit-check' into 'master'Douwe Maan2018-11-161-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Fix bug in Gitlab::Checks::CommitCheck See merge request gitlab-org/gitlab-ce!23045
| * | | | | | Fix bug in CommitCheckfj-fix-bug-commit-checkFrancisco Javier López2018-11-141-2/+2
| | | | | | |
* | | | | | | Merge branch 'frozen-string-lib-gitlab-even-more' into 'master'Stan Hu2018-11-15103-22/+232
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Enable even more frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22959
| * | | | | | Enable even more frozen string in lib/gitlabrepo-forks/gitlab-ce-frozen-string-lib-gitlab-even-moregfyoung2018-11-13103-22/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/fogbugz_import/**/*.rb * lib/gitlab/gfm/**/*.rb * lib/gitlab/git/**/*.rb * lib/gitlab/gitaly_client/**/*.rb * lib/gitlab/gitlab_import/**/*.rb * lib/gitlab/google_code_import/**/*.rb * lib/gitlab/gpg/**/*.rb * lib/gitlab/grape_logging/**/*.rb * lib/gitlab/graphql/**/*.rb * lib/gitlab/graphs/**/*.rb * lib/gitlab/hashed_storage/**/*.rb * lib/gitlab/health_checks/**/*.rb Partially address gitlab-org/gitlab-ce#47424.
* | | | | | | Merge branch '53626-update-config-map-on-install-retry' into 'master'Kamil Trzciński2018-11-151-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update config map if already present on install Closes #53626 See merge request gitlab-org/gitlab-ce!22969
| * | | | | | | Update config map if already present on install53626-update-config-map-on-install-retryThong Kuah2018-11-151-1/+11
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application install fails, and the user retries install, the configmap for the application will already exists. If so, we simply update instead of create.