summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Support backward compatibility when introduce new failure reasonShinya Maeda2018-10-261-2/+1
| |/ / /
| * | | Merge branch 'an-multithreading' into 'master'Robert Speicher2018-10-252-0/+131
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puma in GDK and rack server lifecycle event abstractions Closes #52762 See merge request gitlab-org/gitlab-ce!22372
| | * | | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-252-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us (and others) to test drive Puma without it affecting all users. Puma can be enabled by setting the environment variable "EXPERIMENTAL_PUMA" to a non empty value.
| * | | | Use gitlab_environment for ldap rake task52993-ldap-rename_provider-rake-task-brokenCindy Pallares2018-10-251-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'fix_pat_auth-11-4' into 'security-11-4'Robert Speicher2018-10-291-3/+1
| | | | | | | | | | | | | | | | | | | | [11.4] Fix Token lookup for Git over HTTP and registry authentication See merge request gitlab/gitlabhq!2577
* | | | Merge branch 'security-redact-links' into 'master'Jan Provaznik2018-10-291-0/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [master] Redact unsubscribe links in issuable texts See merge request gitlab/gitlabhq!2528
| * | | | Redact unsubscribe links in issuable textsJan Provaznik2018-10-231-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that user pastes accidentally also unsubscribe link which is included in footer of notification emails. This unsubscribe link contains personal token which attacker then use to act as the original user (e.g. for sending comments under his/her identity).
* | | | | Merge branch 'sh-fix-wiki-security-issue-53072' into 'master'Jan Provaznik2018-10-292-2/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [master] Validate Wiki attachments are valid temporary files See merge request gitlab/gitlabhq!2568
| * | | | | Validate Wiki attachments are valid temporary filesStan Hu2018-10-232-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A malicious attacker could craft a request to read arbitrary files on the system. This change adds a Grape validation to ensure that the tempfile parameter delivered by the Rack multipart uploader is a Tempfile type to prevent users from being able to specify arbitrary filenames. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53072
* | | | | | Merge branch 'security-master-junit-test-report-exposes-stacktrace' into ↵Jan Provaznik2018-10-291-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [master] JUnit test reports endpoint exposes full stack trace in production mode See merge request gitlab/gitlabhq!2559
| * | | | | | Remove full exception stack trace from errorMatija Čupić2018-10-231-4/+4
| | |/ / / / | |/| | | |
* | | | | | [master] Persist only SHA digest of PersonalAccessToken#tokenImre Farkas2018-10-294-12/+61
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-259-83/+135
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'refactor_gitlab_kube_client' into 'master'Kamil Trzciński2018-10-251-40/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Gitlab::KubeClient Closes #52131 See merge request gitlab-org/gitlab-ce!22073
| | * | | | | Store version within SUPPORTED_API_GROUPS hashrefactor_gitlab_kube_clientThong Kuah2018-10-231-41/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the ability to pass in a different version. We can instead create a new entry in the SUPPORTED_API_GROUPS hash for a different version if need be.
| | * | | | | DRY up *_clients methodsThong Kuah2018-10-231-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build using `define_method` directly from the constant, saves us writing api_groups strings twice.
| | * | | | | Split hashed_clients into one per api_groupThong Kuah2018-10-231-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially make #build_kubeclient do less. Should be much clearer now
| | * | | | | Remove api_groups from KubeClient constructorThong Kuah2018-10-231-27/+20
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should have access to #core_client, #rbac_client, and #extensions_client without having to pass in an awkward array. Also change api_version to default_api_version, which allows us to use a different version for an individual client. Special case for apis/extensions which only go up to v1beta1 Makes #hashed_client private Removes the #clients and #discover! methods which are un-used
| * | | | | Merge branch 'jlenny-UpdateAndroidTemplate' into 'master'Grzegorz Bizon2018-10-251-34/+28
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Update Android.gitlab-ci.yml template to current Android SDK version See merge request gitlab-org/gitlab-ce!22531
| | * | | | Update link to blog post since it didn't go out on 23rdjlenny-UpdateAndroidTemplateJason Lenny2018-10-241-1/+1
| | | | | |
| | * | | | Update Android.gitlab-ci.yml with result of new blog post: ↵Jason Lenny2018-10-231-34/+28
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/15746
| * | | | | Convert parser warnings to stdout in haml_lintsh-bump-ruby-2.4.5Lin Jen-Shin2018-10-241-0/+11
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | This was used in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16648 and this could happen from time to time, so let's just keep it.
| * | | | Merge branch '53030-ee-compat-check-frozen-literal' into 'master'test-review-root-passwordSean McGivern2018-10-231-4/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ee-compat-check by not modifying frozen strings Closes #53030 See merge request gitlab-org/gitlab-ce!22527
| | * | | | Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literalMario de la Ossa2018-10-231-4/+6
| | | |/ / | | |/| |
| * | | | Merge branch 'mysql-migration-trigger-permissions' into 'master'Andreas Brandl2018-10-231-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add dbname to MySQL migration GRANT command See merge request gitlab-org/gitlab-ce!21719
| | * | | | Add dbname to MySQL migration GRANT commandRyan Hefner2018-09-131-1/+1
| | | | | |
| * | | | | Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-231-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support licenses and performance See merge request gitlab-org/gitlab-ce!22175
| | * | | | | Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new syntax for all licenses and performance jobs: ```yaml job: reports: performance: performance.json license_management: gl-license-management-report.json ```
| * | | | | | Merge branch 'add-role-binding-to-kubeclient' into 'master'Kamil Trzciński2018-10-232-0/+54
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RoleBinding method and class See merge request gitlab-org/gitlab-ce!22524
| | * | | | | | Add RoleBinding methodsadd-role-binding-to-kubeclientMayra Cabrera2018-10-222-0/+54
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes RoleBinding methods to Kubeclient and introduce a new lib class to generate RoleBinding resources. This MR is part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011
| * | | | | | Remove broken git storage for testingZeger-Jan van de Weg2018-10-231-1/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken storage used to be used to test situations where the Git storage wasn't being reached. These days we can just mock the Gitaly response. But given the broken storage is removed now, Gitaly can take over control of the storage being reachable. If it's not, Gitaly won't boot. That's nice for situations where a disk wasn't mounted for instance. Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675
| * | | | | Merge branch 'sh-pages-eof-error' into 'master'Grzegorz Bizon2018-10-231-2/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EOF detection with CI artifacts metadata Closes #36954 See merge request gitlab-org/gitlab-ce!22479
| | * | | | Fix EOF detection with CI artifacts metadataStan Hu2018-10-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some corner cases where a perfectly correct GZIP stream may not hit the EOF until another read is attempted. We now skip the entry if we don't see any valid data, which allows the EOF check to work properly. Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22479
* | | | | | Merge branch 'sh-block-other-localhost' into 'master'Thiago Presa2018-10-251-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Block additional localhost addresses in UrlBlocker See merge request gitlab/gitlabhq!2487
| * | | | | Block loopback addresses in UrlBlockerStan Hu2018-09-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51128
* | | | | | Merge branch 'feature/gb/improve-include-config-errors-reporting' into 'master'Douwe Maan2018-10-2211-181/+253
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve validation errors for external CI/CD configuration Closes #51369 See merge request gitlab-org/gitlab-ce!22394
| * | | | | | Improve error message when `include` is blockedGrzegorz Bizon2018-10-221-5/+3
| | | | | | |
| * | | | | | Improve remote CI/CD config file extension validationGrzegorz Bizon2018-10-191-2/+2
| | | | | | |
| * | | | | | Extend error message in case of HTTP errors in `include`Grzegorz Bizon2018-10-193-20/+28
| | | | | | |
| * | | | | | Refactor `include` code and improve error reportingGrzegorz Bizon2018-10-184-37/+94
| | | | | | |
| * | | | | | Extract method that fetchesremote CI/CD included configGrzegorz Bizon2018-10-182-11/+10
| | | | | | |
| * | | | | | Add IncludeError exception and use it in CI configGrzegorz Bizon2018-10-182-4/+5
| | | | | | |
| * | | | | | Move external CI config class into proper namespaceGrzegorz Bizon2018-10-166-101/+110
| | | | | | |
| * | | | | | Move external CI config files into Ci class contextGrzegorz Bizon2018-10-165-0/+0
| | | | | | |
* | | | | | | Merge branch '51716-add-kubernetes-namespace-model' into 'master'Andreas Brandl2018-10-221-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Clusters::KubernetesNamespace model See merge request gitlab-org/gitlab-ce!22404
| * | | | | | | Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-modelMayra Cabrera2018-10-221-0/+9
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This model will be used to persist into database Kubernetes properties, such as namespace, service account name and service account token.
* | | | | | | Merge branch 'ce-52112-fix-review-apps-cleanup-ce' into 'master'Nick Thomas2018-10-222-20/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve HelmClient and KubernetesClient See merge request gitlab-org/gitlab-ce!22375
| * | | | | | | Improve automated Review Apps cleanupce-52112-fix-review-apps-cleanup-ceRémy Coutable2018-10-222-20/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'Grzegorz Bizon2018-10-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop allow overflow option duration in numbers Closes #52284 See merge request gitlab-org/gitlab-ce!22246
| * | | | | | | | Drop `allow_overflow` option in `TimeHelper.duration_in_numbers`Shinya Maeda2018-10-181-1/+1
| | | | | | | | |
View Lorry Controller Status