root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
83,517 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

8097 Commits

Author SHA1 Message Date
Grzegorz Bizon 9e2eb85e36 Merge branch 'frozen-string-enable-lib-gitlab-ci-remain' into 'master' 
Enable frozen string for lib/gitlab/ci/**/*.rb

See merge request gitlab-org/gitlab-ce!22703
 2018-11-05 08:46:15 +00:00
Philippe Lafoucrière ccb1ff9aca Update license_management job 2018-11-04 22:48:05 +00:00
Dylan Griffith d86f76320c Use our own docker image for helm install pods 
This will reduce dependencies and failure points during installation. It
will also reduce security risks from untrusted dependencies being able
to effect all our users
 2018-11-02 17:46:33 +00:00
Thong Kuah 5ede567d71 Incorporates Kubernetes Namespace into Cluster's flow 2018-11-02 15:46:15 +00:00
Sean McGivern c0d30fad97 Merge branch 'sh-optimize-reload-diffs-service' into 'master' 
Significantly cut memory and SQL queries when reloading diffs

See merge request gitlab-org/gitlab-ce!22725
 2018-11-02 10:09:50 +00:00
Dmitriy Zaporozhets a0ca86e5a3 Merge branch 'kinolaev-master-patch-91872' into 'master' 
Change HELM_HOST in Auto-DevOps to work behind proxy

See merge request gitlab-org/gitlab-ce!22596
 2018-11-02 07:42:37 +00:00
Robert Speicher 392e3bfad3 Merge branch 'sh-bump-puma-memory-limits' into 'master' 
Reserve more RAM for master process in Puma

See merge request gitlab-org/gitlab-ce!22741
 2018-11-01 21:45:40 +00:00
Sergej 2d75626aad Change HELM_HOST in Auto-DevOps to work behind proxy 2018-11-01 22:29:35 +03:00
Stan Hu de1db4972c Avoidp loading merge request diff files when not needed 2018-11-01 07:50:39 -07:00
Achilleas Pipinellis 7f47e13218 Merge branch 'gt-update-typos-in-comments-and-specs' into 'master' 
Fix typos in comments and specs

See merge request gitlab-org/gitlab-ce!22683
 2018-11-01 10:34:23 +00:00
Sean McGivern 1c50200b9a Merge branch 'sh-optimize-merge-request-project-lookup' into 'master' 
Reduce SQL queries needed to load open merge requests

See merge request gitlab-org/gitlab-ce!22709
 2018-11-01 10:33:27 +00:00
Stan Hu d19ba4439b Reserve more RAM for master process in Puma 
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.
 2018-11-01 00:29:16 -07:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
Douglas Barbosa Alexandre 01d8c1f6f0
Whitelist none method from ActiveRecord::Querying 2018-10-31 15:46:36 -03:00
Stan Hu d4ef4ad752 Reduce SQL queries needed to load open merge requests 
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
 2018-10-30 22:29:57 -07:00
Douwe Maan 571e651b21 Merge branch 'add-language-param-to-highlight' into 'master' 
Add language param to highlight

See merge request gitlab-org/gitlab-ce!21584
 2018-10-30 20:44:03 +00:00
Douwe Maan 7bcd0dc19b Merge branch 'bvl-move-wrapped-gitaly-errors' into 'master' 
Move Repository#wrapped_gitaly_errors into concern

See merge request gitlab-org/gitlab-ce!22691
 2018-10-30 20:43:27 +00:00
gfyoung 5186d6faa1 Enable frozen string for lib/gitlab/ci/**/*.rb 
Enables frozen string for all remaining files
in lib/gitlab/ci.

Partially addresses #47424.
 2018-10-30 13:39:30 -07:00
Stan Hu bbe25533a7 Merge branch 'frozen-string-enable-lib-gitlab-ci' into 'master' 
Enable some frozen string for lib/gitlab/ci

See merge request gitlab-org/gitlab-ce!22636
 2018-10-30 18:11:10 +00:00
Bob Van Landuyt 81f5955eb6 Move Repository#wrapped_gitaly_errors into concern 
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.
 2018-10-30 15:53:46 +01:00
Mark Chao 0fa5260f1d Allow search results to accept project_id 
This gives flexiblity to avoid duplicated query of Project.
 2018-10-30 15:44:55 +08:00
Mark Chao a4ba973e24 Allow FoundBlob to access language from gitattributes 
Extract language_from_git_attributes as a concern so it can
ben included in two blob classes.
 2018-10-30 15:44:55 +08:00
Mark Chao bc14e4ed10 Move :plain option to Highlight class 
This is to DRY the repeated file size check.

Move spec and constants to Highlight
 2018-10-30 15:44:55 +08:00
Mark Chao 39ae9a59a5 Make Highlight accept language param 
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.
 2018-10-30 15:44:55 +08:00
Mark Chao 32f9cf8ce3 Add BlobPresenter for highlighting 
Force FoundBlob to use BlobPresenter
 2018-10-30 15:44:55 +08:00
Mark Chao 6580de78bb Add access to Blob's language from gitattributes 
Ported from Highlight class since it as a concept is more related to
blob, and this allows more flexibility.
 2018-10-30 15:44:55 +08:00
DJ Mountney 06b6daacb1 Merge remote-tracking branch 'origin/master' into dev-master 2018-10-29 14:37:19 -07:00
Robert Speicher 6c5154b5bc Merge branch 'rails5-deprecated-uniq' into 'master' 
Replace deprecated uniq on a Relation with distinct

See merge request gitlab-org/gitlab-ce!22625
 2018-10-29 18:35:05 +00:00
Robert Speicher c847f172d2 Merge branch 'fix_pat_auth-11-4' into 'security-11-4' 
[11.4] Fix Token lookup for Git over HTTP and registry authentication

See merge request gitlab/gitlabhq!2577
 2018-10-29 17:20:53 +01:00
Jan Provaznik 5b0b73d922 Merge branch 'security-redact-links' into 'master' 
[master] Redact unsubscribe links in issuable texts

See merge request gitlab/gitlabhq!2528
 2018-10-29 16:10:32 +00:00
Jan Provaznik 58646c65d5 Merge branch 'security-master-junit-test-report-exposes-stacktrace' into 'master' 
[master] JUnit test reports endpoint exposes full stack trace in production mode

See merge request gitlab/gitlabhq!2559
 2018-10-29 16:07:14 +00:00
Imre Farkas b9652d8e4d [master] Persist only SHA digest of PersonalAccessToken#token 2018-10-29 16:06:45 +00:00
Kamil Trzciński 0acdd3d3dd
Rename 'sast_container' licensed feature 2018-10-29 10:32:59 -04:00
Andrew Newdigate 9a25cfc80b Fix open-ended params for api_json.log 2018-10-29 13:44:09 +00:00
Grzegorz Bizon 5a460397a1 Merge branch '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
 2018-10-29 10:02:11 +00:00
Shinya Maeda 4611a59968 Add failure reason for execution timeout 2018-10-28 18:31:08 +00:00
gfyoung 06892e88f5 Enable frozen string for lib/gitlab/ci 
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.
 2018-10-26 16:36:42 -07:00
Douwe Maan e997b22df5 Merge branch '51335-fail-early-when-user-cannot-be-identified' into 'master' 
User not defined in PostReceive#process_project_changes

Closes #51335

See merge request gitlab-org/gitlab-ce!22519
 2018-10-26 18:06:25 +00:00
Douwe Maan f2e9148d18 Merge branch '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
 2018-10-26 18:03:40 +00:00
Jasper Maes db80db793f Replace deprecated uniq on a Relation with distinct 2018-10-26 18:19:28 +02:00
Matija Čupić 0079fa19ce
Remove cache_sha parameter 2018-10-26 14:53:04 +02:00
Lin Jen-Shin 84e441d808 Make it clear that we intent to use | over || 2018-10-26 18:43:33 +08:00
Tiago Botelho 41fe3fdfc3
Reverts commits_check message 2018-10-26 09:50:44 +01:00
Lin Jen-Shin d045df3da8 Allow CE do nothing if route doesn't exist 2018-10-26 14:27:05 +08:00
Lin Jen-Shin 52fa309e86 Extract EE only oauth routes and add tests 2018-10-26 14:27:05 +08:00
Lin Jen-Shin f1701c0fec Make it possible to add EE only route 
And if it cannot find any routes, raise an error
 2018-10-26 14:27:05 +08:00
Lin Jen-Shin 1581f75fb5 Put EE routes in EE files under EE directories 2018-10-26 14:27:05 +08:00
Robert Speicher 679c0048a8 Merge branch 'an-multithreading' into 'master' 
Puma in GDK and rack server lifecycle event abstractions

Closes #52762

See merge request gitlab-org/gitlab-ce!22372
 2018-10-25 22:29:00 +00:00
Matija Čupić dd2e91cc78
Cache pipeline status only for specific sha 2018-10-25 19:57:08 +02:00
Andrew Newdigate 1065f8ce7a Add experimental support for Puma 
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.
 2018-10-25 17:50:15 +01:00