summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'frozen-string-enable-lib-gitlab-ci' into 'master'Stan Hu2018-10-3089-2/+183
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Enable some frozen string for lib/gitlab/ci See merge request gitlab-org/gitlab-ce!22636
| * | | Enable frozen string for lib/gitlab/cigfyoung2018-10-2689-2/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/ci/*.rb * lib/gitlab/ci/build/**/*.rb * lib/gitlab/ci/config/**/*.rb * lib/gitlab/ci/pipeline/**/*.rb * lib/gitlab/ci/reports/**/*.rb Partially addresses #47424.
* | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-2924-84/+434
|\ \ \ \
| * \ \ \ Merge branch 'rails5-deprecated-uniq' into 'master'Robert Speicher2018-10-291-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace deprecated uniq on a Relation with distinct See merge request gitlab-org/gitlab-ce!22625
| | * | | | Replace deprecated uniq on a Relation with distinctJasper Maes2018-10-261-1/+1
| | | | | |
| * | | | | Rename 'sast_container' licensed feature5979_rename_sast_container_gitlab_features-ceKamil Trzciński2018-10-291-1/+1
| | | | | |
| * | | | | Fix open-ended params for api_json.logAndrew Newdigate2018-10-291-1/+9
| | |_|/ / | |/| | |
| * | | | Merge branch ↵Grzegorz Bizon2018-10-291-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelines' into 'master' Resolve "Stale pipeline status cache for `_project` after disabling pipelines" Closes #52780 See merge request gitlab-org/gitlab-ce!22589
| | * | | | Remove cache_sha parameterMatija Čupić2018-10-261-2/+2
| | | | | |
| | * | | | Cache pipeline status only for specific shaMatija Čupić2018-10-251-5/+5
| | | | | |
| * | | | | Add failure reason for execution timeoutShinya Maeda2018-10-281-1/+2
| | |_|/ / | |/| | |
| * | | | Merge branch '51335-fail-early-when-user-cannot-be-identified' into 'master'Douwe Maan2018-10-262-20/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User not defined in PostReceive#process_project_changes Closes #51335 See merge request gitlab-org/gitlab-ce!22519
| | * | | | Removes idenfitication by commit from Gitlab::Identifier51335-fail-early-when-user-cannot-be-identifiedTiago Botelho2018-10-252-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we would need to identify a user when pushing through the GitLab UI. Since this is no longer the case we can remove the identification by commit and instead, use the identify_using_user
| | * | | | User not defined in PostReceive#process_project_changesTiago Botelho2018-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Gitlab::GitPostReceive#changes_refs is empty user would not get defined and nil would be passed to PostReceive#after_project_changes_hooks which would then throw an error.
| * | | | | Merge branch ↵Douwe Maan2018-10-267-46/+197
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42790-improve-feedback-for-internal-git-access-checks-timeouts' into 'master' Adds trace of each access check when git push times out Closes #42790 See merge request gitlab-org/gitlab-ce!22265
| | * | | | Reverts commits_check messageTiago Botelho2018-10-261-1/+1
| | | | | |
| | * | | | Iterating through commit list times outTiago Botelho2018-10-253-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validating each commit on ChangeAccess times out if it already took too long to complete. Improves the TimedLogger specs to not make use of a stubbed class anymore
| | * | | | Refactors TimedLogger to be more OOP compliantTiago Botelho2018-10-253-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a #full_message method so that external classes do not have access to the state of the logger. Adds a #append_message to always append to the array in-place
| | * | | | Adds tracing messages for slow git pushesTiago Botelho2018-10-257-46/+181
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a git push takes more than 50 seconds the user will receive a trace from each check performed along with their timings
| * | | | Feature/add license to project APIJ.D. Bean2018-10-262-5/+27
| | | | |
| * | | | Merge branch '7864-ee-routes' into 'master'Sean McGivern2018-10-261-0/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE: Put EE routes in EE files under EE directories See merge request gitlab-org/gitlab-ce!22376
| | * | | | Make it clear that we intent to use | over ||Lin Jen-Shin2018-10-261-2/+3
| | | | | |
| | * | | | Allow CE do nothing if route doesn't exist7864-ee-routesLin Jen-Shin2018-10-261-2/+2
| | | | | |
| | * | | | Extract EE only oauth routes and add testsLin Jen-Shin2018-10-261-2/+6
| | | | | |
| | * | | | Make it possible to add EE only routeLin Jen-Shin2018-10-261-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | And if it cannot find any routes, raise an error
| | * | | | Put EE routes in EE files under EE directoriesLin Jen-Shin2018-10-261-0/+21
| | | | | |
| * | | | | Merge branch '52384-api-filter-assignee-none-any' into 'master'Sean McGivern2018-10-263-2/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Filter by `None`/`Any` for assignee_id in issues/mrs API" Closes #52384 See merge request gitlab-org/gitlab-ce!22598
| | * | | | | Support lowercase none / anyHeinrich Lee Yu2018-10-261-1/+1
| | | | | | |
| | * | | | | Refactor api validator to separate classHeinrich Lee Yu2018-10-263-8/+15
| | | | | | |
| | * | | | | Apply similar change to MRs APIHeinrich Lee Yu2018-10-262-2/+6
| | | | | | |
| | * | | | | Issues API: Add None/Any option to assignee_idHeinrich Lee Yu2018-10-261-1/+5
| | |/ / / /
| * | | | | 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
View Lorry Controller Status