summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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 'docs/rs-revert-api-version' into 'master'Evan Read2018-11-161-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Revert API is going into 11.5, not 11.6. See merge request gitlab-org/gitlab-ce!23060
| * | | | | | | Revert API is going into 11.5, not 11.6.docs/rs-revert-api-versionRobert Speicher2018-11-141-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | 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 'if-53347_fix_impersonation_tokens' into 'master'Stan Hu2018-11-152-3/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Display impersonation token value only after creation See merge request gitlab-org/gitlab-ce!22916
| * | | | | | | Display impersonation token value only after creationif-53347_fix_impersonation_tokensImre Farkas2018-11-122-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we migrated all PersonlAccessTokens to store only its hash in the DB, the token value can no longer be shown to the user.
* | | | | | | | 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.
* | | | | | | | Add knative client to kubeclient libraryChris Baumbauer2018-11-151-1/+2
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'osw-fallback-on-blank-refs' into 'master'Grzegorz Bizon2018-11-151-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid Gitaly RPC errors when fetching diff stats Closes gitaly#1393 See merge request gitlab-org/gitlab-ce!22995
| * | | | | | | Avoid Gitaly RPC errors when fetching diff statsosw-fallback-on-blank-refsOswaldo Ferreira2018-11-141-1/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'auto_devops_kubernetes_active' into 'master'Grzegorz Bizon2018-11-151-10/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch kubernetes:active with checking $KUBECONFIG Closes gitlab-ee#8311 See merge request gitlab-org/gitlab-ce!22929
| * | | | | | Use except:variables to fix multiple variable jobsauto_devops_kubernetes_activeThong Kuah2018-11-091-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As `only:variables` has the effect of being satisfied by any one of variable expression - this will create a situation where e.g. the dast job will be active even if there's no cluster. So use `except:variables which requires each and every variable expression to be satisfied.
| * | | | | | Switch kubernetes:active with checking $KUBECONFIGThong Kuah2018-11-091-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have found an issue with `kubernetes:active` where it doesn't work with multiple clusters. Switch with the similar $KUBECONFIG variable check but this check actually gets the variable from the cluster matching the environment name. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/8311
* | | | | | | Track Kubernetes errors using SentryDylan Griffith2018-11-141-3/+11
| | | | | | |
* | | | | | | Merge branch 'patch-31' into 'master'Rémy Coutable2018-11-141-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Update comment in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!23013
| * | | | | | Update Auto-DevOps.gitlab-ci.ymlTripple Moon2018-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | Typo in comment INCREMENTAL_ROLLOUT_TYPE => INCREMENTAL_ROLLOUT_MODE
* | | | | | | Show HTTP response code for Kubernetes errorsThong Kuah2018-11-132-16/+6
| | | | | | |
* | | | | | | Merge branch 'zj-remove-broken-storage' into 'master'Douwe Maan2018-11-131-37/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Remove obsolete gitlab_shell checks See merge request gitlab-org/gitlab-ce!22417
| * | | | | | Migrate storage checks to GitalyZeger-Jan van de Weg2018-11-091-37/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these checks are not valuable in the current setup, thus removed and replaced by Gitaly checking if its read and writeable. Depends on: 1. https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* | | | | | Merge branch 'ashmckenzie/hmac-token-decode-and-tests' into 'master'Stan Hu2018-11-132-2/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relocate JSONWebToken::HMACToken from EE See merge request gitlab-org/gitlab-ce!22906
| * | | | | | Relocate JSONWebToken::HMACToken from EEashmckenzie/hmac-token-decode-and-testsAsh McKenzie2018-11-132-2/+35
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ce-3777-promote-to-epic' into 'master'Rémy Coutable2018-11-124-19/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring Issues::MoveService (port of promote epics) See merge request gitlab-org/gitlab-ce!22766
| * | | | | | Extract code from Issues::MoveServicece-3777-promote-to-epicJarka Košanová2018-11-124-19/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract code to make it easier reusable - introduce AttributesRewriter and ContentRewriter - support group entites when rewriting content - make Uploader copy_to working for Namespaces
* | | | | | | Merge branch 'sh-53180-append-path' into 'master'Rémy Coutable2018-11-125-22/+10
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure there's only one slash as path separator Closes #53180 See merge request gitlab-org/gitlab-ce!22954
| * | | | | | Make sure there's only one slash as path separatorsh-53180-append-pathStan Hu2018-11-095-22/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4, `URI.join("http://test//", "a").to_s` will remove the double slash, however it's not the case in Ruby 2.5. Using chomp should work better for the intention, as we're not trying to allow things like ../ or / paths resolution. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53180
* | | | | | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-124-4/+275
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * | | | | | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-094-4/+275
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'patch-31' into 'master'Stan Hu2018-11-121-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set an empty entrypoint for license_management job Closes #53786 See merge request gitlab-org/gitlab-ce!22955
| * | | | | Set an empty entrypoint for license_management jobPhilippe Lafoucrière2018-11-101-1/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-121-0/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
| * | | | Add Discord integrationblackst0ne2018-10-301-0/+9
| | | | |
* | | | | Remove circular dependency on Redactable in migrationStan Hu2018-11-092-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::BackgroundMigration::RedactLinks was prepending EE::Gitlab::BackgroundMigration::RedactLinks, while EE::Gitlab::BackgroundMigration::RedactLinks was trying to include Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed with an uninitialized constant (https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511).
* | | | | Merge branch 'rs-cherry-pick-api' into 'master'Nick Thomas2018-11-091-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve possible cherry pick API race condition Closes #53773 See merge request gitlab-org/gitlab-ce!22946
| * | | | | Resolve possible cherry pick API race conditionrs-cherry-pick-apiRobert Speicher2018-11-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we just fetched the latest commit for the given branch when presenting the resulting commit, but because something could have been committed to that branch between the time we cherry-picked and the time we render the result, the wrong commit could have been presented. Now, we fetch the commit object with the commit SHA returned by the commit change service, which should always be the correct commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53773
* | | | | | Merge branch 'frozen-string-lib-gitlab-more' into 'master'Rémy Coutable2018-11-09101-5/+209
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable even more frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22863
| * | | | | | Enable even more frozen string in lib/gitlabgfyoung2018-11-06101-5/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozens string for the following: * lib/gitlab/conflict/**/*.rb * lib/gitlab/cross_project_access/**/*.rb * lib/gitlab/cycle_analytics/**/*.rb * lib/gitlab/data_builder/**/*.rb * lib/gitlab/database/**/*.rb * lib/gitlab/dependency_linker/**/*.rb * lib/gitlab/diff/**/*.rb * lib/gitlab/downtime_check/**/*.rb * lib/gitlab/email/**/*.rb * lib/gitlab/etag_caching/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424.
* | | | | | | Merge branch 'rs-revert-api' into 'master'Nick Thomas2018-11-091-0/+34
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
| * | | | | | Add revert to commits APIRobert Speicher2018-11-091-0/+34
| | |_|_|/ / | |/| | | |
* | | | | | Improve Debugging Capabilities For Helm Application InstallsDylan Griffith2018-11-094-7/+7
|/ / / / /