summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinolaev-master-patch-91872' into 'master'Dmitriy Zaporozhets2018-11-021-1/+1
|\ | | | | | | | | Change HELM_HOST in Auto-DevOps to work behind proxy See merge request gitlab-org/gitlab-ce!22596
| * Change HELM_HOST in Auto-DevOps to work behind proxySergej2018-11-011-1/+1
| |
* | Merge branch 'sh-bump-puma-memory-limits' into 'master'Robert Speicher2018-11-011-1/+5
|\ \ | | | | | | | | | | | | Reserve more RAM for master process in Puma See merge request gitlab-org/gitlab-ce!22741
| * | Reserve more RAM for master process in Pumash-bump-puma-memory-limitsStan Hu2018-11-011-1/+5
| | | | | | | | | | | | | | | | | | The Puma Worker Killer checks the total RAM used by both the master and worker processes. Bump the limits to N+1 instead of N workers to account for this.
* | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-0112-14/+14
|\ \ \ | | | | | | | | | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
| * | | Fix typos in comments and specsGeorge Tsiolis2018-11-0112-14/+14
| | | |
* | | | Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'Sean McGivern2018-11-011-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Reduce SQL queries needed to load open merge requests See merge request gitlab-org/gitlab-ce!22709
| * | | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SQL queries and memory allocation in MergeRequests::RefreshService is dominated by queries for Project and Route loads. On staging, the absence of an inverse relationship caused Rails to make over 1100 extraneous SQL queries for the www-gitlab-com repository. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* | | | Whitelist none method from ActiveRecord::Queryingda-rubocop-whitelist-active-record-noneDouglas Barbosa Alexandre2018-10-311-2/+0
|/ / /
* | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-306-20/+57
|\ \ \ | | | | | | | | | | | | | | | | Add language param to highlight See merge request gitlab-org/gitlab-ce!21584
| * | | Allow search results to accept project_idadd-language-param-to-highlightMark Chao2018-10-301-1/+6
| | | | | | | | | | | | | | | | This gives flexiblity to avoid duplicated query of Project.
| * | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-302-7/+6
| | | | | | | | | | | | | | | | | | | | Extract language_from_git_attributes as a concern so it can ben included in two blob classes.
| * | | Move :plain option to Highlight classMark Chao2018-10-302-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is to DRY the repeated file size check. Move spec and constants to Highlight
| * | | Make Highlight accept language paramMark Chao2018-10-304-16/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the repository param. This allows more flexiblity as sometimes we have highlight content not related to repository. Sometimes we know ahead of time the language of the content. Lastly language determination seems better fit as a logic in the Blob class. `repository` param is only used to determine the language, which seems to be the responsiblity of Blob.
| * | | Add BlobPresenter for highlightingMark Chao2018-10-301-0/+5
| | | | | | | | | | | | | | | | Force FoundBlob to use BlobPresenter
| * | | Add access to Blob's language from gitattributesMark Chao2018-10-301-0/+6
| |/ / | | | | | | | | | | | | Ported from Highlight class since it as a concept is more related to blob, and this allows more flexibility.
* | | Merge branch 'bvl-move-wrapped-gitaly-errors' into 'master'Douwe Maan2018-10-309-35/+48
|\ \ \ | | | | | | | | | | | | | | | | Move Repository#wrapped_gitaly_errors into concern See merge request gitlab-org/gitlab-ce!22691
| * | | Move Repository#wrapped_gitaly_errors into concernBob Van Landuyt2018-10-309-35/+48
| |/ / | | | | | | | | | | | | | | | Having this in a concern allows us to reuse it for different single purpose classes that call out to git without going through the repository every time.
* | | 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-2916-74/+386
|\ \ \
| * \ \ 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-266-46/+195
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-256-46/+179
| | |/ / | | | | | | | | | | | | | | | | | | | | Whenever a git push takes more than 50 seconds the user will receive a trace from each check performed along with their timings
| * | | 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 '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.
* | | 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 '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-293-3/+56
| | | |
View Lorry Controller Status