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
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
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
32f9cf8ce3
Add BlobPresenter for highlighting
...
Force FoundBlob to use BlobPresenter
2018-10-30 15:44:55 +08:00
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
06b6daacb1
Merge remote-tracking branch 'origin/master' into dev-master
2018-10-29 14:37:19 -07:00
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
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
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
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
b9652d8e4d
[master] Persist only SHA digest of PersonalAccessToken#token
2018-10-29 16:06:45 +00:00
0acdd3d3dd
Rename 'sast_container' licensed feature
2018-10-29 10:32:59 -04:00
9a25cfc80b
Fix open-ended params for api_json.log
2018-10-29 13:44:09 +00:00
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
4611a59968
Add failure reason for execution timeout
2018-10-28 18:31:08 +00:00
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
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
db80db793f
Replace deprecated uniq on a Relation with distinct
2018-10-26 18:19:28 +02:00
0079fa19ce
Remove cache_sha parameter
2018-10-26 14:53:04 +02:00
84e441d808
Make it clear that we intent to use | over ||
2018-10-26 18:43:33 +08:00
41fe3fdfc3
Reverts commits_check message
2018-10-26 09:50:44 +01:00
d045df3da8
Allow CE do nothing if route doesn't exist
2018-10-26 14:27:05 +08:00
52fa309e86
Extract EE only oauth routes and add tests
2018-10-26 14:27:05 +08:00
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
1581f75fb5
Put EE routes in EE files under EE directories
2018-10-26 14:27:05 +08:00
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
dd2e91cc78
Cache pipeline status only for specific sha
2018-10-25 19:57:08 +02:00
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
fee6989fa0
Merge remote-tracking branch 'origin/master' into dev-master
2018-10-25 08:48:14 -07:00
9e6098a6db
Merge branch 'refactor_gitlab_kube_client' into 'master'
...
Refactor Gitlab::KubeClient
Closes #52131
See merge request gitlab-org/gitlab-ce!22073
2018-10-25 12:02:11 +00:00
5726e51aaa
Merge branch 'jlenny-UpdateAndroidTemplate' into 'master'
...
Update Android.gitlab-ci.yml template to current Android SDK version
See merge request gitlab-org/gitlab-ce!22531
2018-10-25 10:46:49 +00:00
679d9b21b7
Removes idenfitication by commit from Gitlab::Identifier
...
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
2018-10-25 11:36:26 +01:00
f8ee07d9ee
User not defined in PostReceive#process_project_changes
...
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.
2018-10-25 11:23:34 +01:00
e0225aea1b
Iterating through commit list times out
...
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
2018-10-25 10:52:03 +01:00
cb5f4d0cad
Refactors TimedLogger to be more OOP compliant
...
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
2018-10-25 10:10:46 +01:00
084a8b6101
Adds tracing messages for slow git pushes
...
Whenever a git push takes more than 50 seconds the user
will receive a trace from each check performed along with
their timings
2018-10-25 10:10:45 +01:00
cc571e18d3
Merge branch 'sh-block-other-localhost' into 'master'
...
Block additional localhost addresses in UrlBlocker
See merge request gitlab/gitlabhq!2487
2018-10-25 01:05:44 +00:00
f2fcaaf3e0
Update link to blog post since it didn't go out on 23rd
2018-10-24 09:08:48 +00:00
c1c1496405
Redact unsubscribe links in issuable texts
...
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).
2018-10-23 21:20:20 +02:00
11a57e4f29
Merge branch '53030-ee-compat-check-frozen-literal' into 'master'
...
Fix ee-compat-check by not modifying frozen strings
Closes #53030
See merge request gitlab-org/gitlab-ce!22527
2018-10-23 18:03:57 +00:00
7dc70e0d67
Fix ee-compat-check by not modifying frozen strings
2018-10-23 09:15:17 -06:00
a84469a345
Merge branch 'mysql-migration-trigger-permissions' into 'master'
...
Add dbname to MySQL migration GRANT command
See merge request gitlab-org/gitlab-ce!21719
2018-10-23 12:30:14 +00:00
6bf8032735
Remove full exception stack trace from error
2018-10-23 14:16:49 +02:00
708875ae9e
Merge branch 'support-license-management-and-performance' into 'master'
...
Support licenses and performance
See merge request gitlab-org/gitlab-ce!22175
2018-10-23 12:07:05 +00:00
a5419138fd
Store version within SUPPORTED_API_GROUPS hash
...
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.
2018-10-23 23:52:34 +13:00
170071e365
DRY up *_clients methods
...
Build using `define_method` directly from the constant, saves us writing
api_groups strings twice.
2018-10-23 23:38:44 +13:00
27979aac0a
Split hashed_clients into one per api_group
...
Essentially make #build_kubeclient do less.
Should be much clearer now
2018-10-23 23:36:44 +13:00
983c4a50d0
Remove api_groups from KubeClient constructor
...
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
2018-10-23 23:36:43 +13:00
f8f447b83e
Merge branch 'add-role-binding-to-kubeclient' into 'master'
...
Add RoleBinding method and class
See merge request gitlab-org/gitlab-ce!22524
2018-10-23 10:36:28 +00:00
ae13305e73
Update Android.gitlab-ci.yml with result of new blog post: https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/15746
2018-10-23 08:49:46 +00:00
Mark Chao
DJ Mountney
Robert Speicher
Jan Provaznik
Imre Farkas
Kamil Trzciński
Andrew Newdigate
Grzegorz Bizon
Shinya Maeda
Douwe Maan
Jasper Maes
Matija Čupić
Lin Jen-Shin
Tiago Botelho
Thiago Presa
Jason Lenny
Sean McGivern
Mario de la Ossa
Andreas Brandl
Thong Kuah