Kamil Trzciński
348dd42d79
Merge branch 'sh-use-nokogiri-xml-backend' into 'master'
...
Use Nokogiri as the ActiveSupport XML backend
Closes #54068
See merge request gitlab-org/gitlab-ce!23136
2018-11-16 11:49:40 +00:00
Zeger-Jan van de Weg
35239a6aec
Show what RPC is called in the performance bar
...
Now only the data was shown of the service, which is not valueable at
times given some of those expose a lot of RPCs.
2018-11-16 12:16:25 +01:00
James Lopez
a4ae5411f5
Fix rubocop warning
2018-11-16 12:09:18 +01:00
Dylan Griffith
1244533b77
Remove unnecessary --tiller-namespace
2018-11-16 10:57:48 +00:00
Dylan Griffith
9b1a99b03d
Use helm version loop instead of sleep in ClientCommand
2018-11-16 10:57:27 +00:00
Dylan Griffith
a71b3f6a7c
Extract Helm::ClientCommand for shared commands
2018-11-16 10:57:20 +00:00
Grzegorz Bizon
875bae16d0
Merge branch 'allow-to-use-glob-for-ci-changes-detection' into 'master'
...
Add glob for CI changes detection
See merge request gitlab-org/gitlab-ce!23128
2018-11-16 10:35:18 +00:00
Sean McGivern
85ec04eaaa
Merge branch 'gt-fix-typos-in-lib' into 'master'
...
Fix typos in lib
See merge request gitlab-org/gitlab-ce!23106
2018-11-16 10:32:31 +00:00
James Lopez
53b2c3011e
Remove redundant end anchors
2018-11-16 11:27:47 +01:00
Dylan Griffith
fe1469e12f
Upgrade helm to 2.11.0 and upgrade on every install
2018-11-16 10:22:40 +00:00
James Lopez
f837281ff6
Update regex to use union
2018-11-16 11:03:45 +01:00
Douwe Maan
a480c551a2
Merge branch 'fj-fix-bug-commit-check' into 'master'
...
Fix bug in Gitlab::Checks::CommitCheck
See merge request gitlab-org/gitlab-ce!23045
2018-11-16 08:53:58 +00:00
Stan Hu
198f2a0b61
Use Nokogiri as the ActiveSupport XML backend
...
This significantly improves performance and reduces memory consumption
when parsing XML files. On a test with 124 JUnit files from a CE build,
there was about a 4x reduction in processing time.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54068
2018-11-16 00:23:36 -08:00
Kirill Zaitsev
9bea3c0fbb
Add glob for CI changes detection
2018-11-15 22:04:47 +02:00
Stan Hu
6494467a19
Merge branch 'frozen-string-lib-gitlab-even-more' into 'master'
...
Enable even more frozen string in lib/gitlab
See merge request gitlab-org/gitlab-ce!22959
2018-11-15 19:50:53 +00:00
Kamil Trzciński
5059c15d06
Merge branch '53626-update-config-map-on-install-retry' into 'master'
...
Update config map if already present on install
Closes #53626
See merge request gitlab-org/gitlab-ce!22969
2018-11-15 12:33:40 +00:00
Amit Rathi
161e66890c
Set appropriate RBAC flag for cluster applications
2018-11-15 17:52:41 +05:30
Chris Baumbauer
327892b23e
Add knative client to kubeclient library
2018-11-15 11:39:43 +00:00
George Tsiolis
566ba126f5
Fix typos in lib
2018-11-15 12:15:43 +02:00
Thong Kuah
429d3e4952
Update config map if already present on install
...
When an application install fails, and the user retries install, the
configmap for the application will already exists. If so, we simply
update instead of create.
2018-11-15 22:39:42 +13:00
Grzegorz Bizon
7528b2d260
Merge branch 'osw-fallback-on-blank-refs' into 'master'
...
Avoid Gitaly RPC errors when fetching diff stats
Closes gitaly#1393
See merge request gitlab-org/gitlab-ce!22995
2018-11-15 09:16:30 +00:00
Grzegorz Bizon
1cccfca1dc
Merge branch 'auto_devops_kubernetes_active' into 'master'
...
Switch kubernetes:active with checking $KUBECONFIG
Closes gitlab-ee#8311
See merge request gitlab-org/gitlab-ce!22929
2018-11-15 09:09:26 +00:00
Oswaldo Ferreira
039df0267e
Avoid Gitaly RPC errors when fetching diff stats
2018-11-14 17:33:30 -02:00
James Lopez
3cd538c2e9
Fix text rendering of readme/index
2018-11-14 16:07:31 +01:00
Dylan Griffith
ba7cfdc2d7
Track Kubernetes errors using Sentry
2018-11-14 11:10:36 +00:00
Rémy Coutable
dff3ded57f
Merge branch 'patch-31' into 'master'
...
Update comment in Auto-DevOps.gitlab-ci.yml
See merge request gitlab-org/gitlab-ce!23013
2018-11-14 10:22:00 +00:00
Francisco Javier López
3797cfbd39
Fix bug in CommitCheck
2018-11-14 09:55:57 +01:00
Amit Rathi
5c275490ec
Merge branch 'master' into certmanager-temp
2018-11-14 10:14:50 +05:30
gfyoung
ebf98f27c4
Enable even more frozen string in lib/gitlab
...
Enables frozen string for the following:
* lib/gitlab/fogbugz_import/**/*.rb
* lib/gitlab/gfm/**/*.rb
* lib/gitlab/git/**/*.rb
* lib/gitlab/gitaly_client/**/*.rb
* lib/gitlab/gitlab_import/**/*.rb
* lib/gitlab/google_code_import/**/*.rb
* lib/gitlab/gpg/**/*.rb
* lib/gitlab/grape_logging/**/*.rb
* lib/gitlab/graphql/**/*.rb
* lib/gitlab/graphs/**/*.rb
* lib/gitlab/hashed_storage/**/*.rb
* lib/gitlab/health_checks/**/*.rb
Partially address gitlab-org/gitlab-ce#47424 .
2018-11-13 11:42:15 -08:00
Amit Rathi
631ab89885
Use email on the account
2018-11-13 20:36:06 +05:30
Thong Kuah
14b3033a0d
Show HTTP response code for Kubernetes errors
2018-11-13 12:46:01 +00:00
Amit Rathi
0e4ad53c92
Remove logging from pod.rb
2018-11-13 17:42:34 +05:30
Amit Rathi
7be10a7c21
Remove logging changes
2018-11-13 17:40:38 +05:30
Amit Rathi
6dda43d67e
Cleanup
2018-11-13 17:38:04 +05:30
Amit Rathi
0e8e75581b
Merge branch 'master' into certmanager-temp
2018-11-13 17:00:43 +05:30
Amit Rathi
206f6747ec
Updated logging
2018-11-13 16:57:49 +05:30
Tripple Moon
b9ec3c2ffa
Update Auto-DevOps.gitlab-ci.yml
...
Typo in comment INCREMENTAL_ROLLOUT_TYPE => INCREMENTAL_ROLLOUT_MODE
2018-11-13 07:27:22 +00:00
Rémy Coutable
ec3712c201
Merge branch 'ce-3777-promote-to-epic' into 'master'
...
Refactoring Issues::MoveService (port of promote epics)
See merge request gitlab-org/gitlab-ce!22766
2018-11-12 20:22:57 +00:00
Rémy Coutable
33cd8efbd7
Merge branch 'sh-53180-append-path' into 'master'
...
Make sure there's only one slash as path separator
Closes #53180
See merge request gitlab-org/gitlab-ce!22954
2018-11-12 19:37:36 +00:00
Douwe Maan
56834e6bb2
Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'
...
Comment on any expanded diff line on MRs (with feature-flag)
Closes #13950
See merge request gitlab-org/gitlab-ce!22914
2018-11-12 15:36:48 +00:00
Jarka Košanová
4af1712d01
Extract code from Issues::MoveService
...
Extract code to make it easier reusable
- introduce AttributesRewriter and ContentRewriter
- support group entites when rewriting content
- make Uploader copy_to working for Namespaces
2018-11-12 08:57:25 +01:00
Amit Rathi
c2407dab3e
Merge branch 'master' into certmanager-temp
2018-11-12 12:06:59 +05:30
Philippe Lafoucrière
a737c4fb5d
Set an empty entrypoint for license_management job
2018-11-10 01:18:33 +00:00
Stan Hu
39f252254b
Make sure there's only one slash as path separator
...
In Ruby 2.4, `URI.join("http://test// ", "a").to_s` will
remove the double slash, however it's not the case in
Ruby 2.5. Using chomp should work better for the intention,
as we're not trying to allow things like ../ or / paths
resolution.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53180
2018-11-09 15:36:45 -08:00
Stan Hu
6a91b28932
Remove circular dependency on Redactable in migration
...
Gitlab::BackgroundMigration::RedactLinks was prepending
EE::Gitlab::BackgroundMigration::RedactLinks, while
EE::Gitlab::BackgroundMigration::RedactLinks was trying to include
Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed
with an uninitialized constant
(https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511 ).
2018-11-09 12:59:39 -08:00
Oswaldo Ferreira
f9b4130bb7
Comment on any expanded diff line on MRs
2018-11-09 16:56:48 -02:00
Rémy Coutable
32bf2667d2
Merge branch 'frozen-string-lib-gitlab-more' into 'master'
...
Enable even more frozen string in lib/gitlab
See merge request gitlab-org/gitlab-ce!22863
2018-11-09 17:26:46 +00:00
Dylan Griffith
da7836956e
Improve Debugging Capabilities For Helm Application Installs
2018-11-09 15:03:24 +00:00
Thong Kuah
1e367810dc
Use except:variables to fix multiple variable jobs
...
As `only:variables` has the effect of being satisfied by any one of
variable expression - this will create a situation where e.g. the dast
job will be active even if there's no cluster.
So use `except:variables which requires each and every variable
expression to be satisfied.
2018-11-09 17:01:35 +13:00
Thong Kuah
f44b7ac6b7
Switch kubernetes:active with checking $KUBECONFIG
...
We have found an issue with `kubernetes:active` where it doesn't work
with multiple clusters. Switch with the similar $KUBECONFIG variable
check but this check actually gets the variable from the cluster
matching the environment name.
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/8311
2018-11-09 13:45:41 +13:00
Kamil Trzciński
036c9c58ba
Limit parallel to 100
...
This prevents some of the abusive behaviors, of someone putting 100000 and creating out of memory condition easily
2018-11-08 11:58:54 +01:00
Oswaldo Ferreira
198402b38b
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
...
This reverts commit a82a595728 , reversing
changes made to e7df959b8f .
2018-11-07 19:57:26 -02:00
Sean McGivern
cc9e3d0900
Merge branch 'jira-ping-differentiate-cloud' into 'master'
...
Usage ping - Differentiate Jira Server and Cloud
Closes #51043
See merge request gitlab-org/gitlab-ce!22791
2018-11-07 20:09:24 +00:00
Mario de la Ossa
013d097e8b
Usage ping - Differentiate Jira Server and Cloud
2018-11-07 11:28:04 -06:00
Bob Van Landuyt
c85a19f920
Allow limiting quick actions to execute
...
Sometimes we don't want to trigger any quick actions that cause side
effects. For example when building a record to validate. This allows
listing the quick actions that need to be performed.
2018-11-07 16:27:55 +01:00
Bob Van Landuyt
6fbdc5ed52
Apply patches when creating MR via email
...
This allows users to add patches as attachments to merge request
created via email.
When an email to create a merge request is sent, all the attachments
ending in `.patch` will be applied to the branch specified in the
subject of the email. If the branch did not exist, it will be created
from the HEAD of the repository.
When the patches could not be applied, the error message will be
replied to the user.
The patches can have a maximum combined size of 2MB for now.
2018-11-07 16:27:55 +01:00
Sean McGivern
6d8810a64f
Merge branch 'fj-41213-api-update-submodule-commit' into 'master'
...
Add endpoint to update a git submodule reference
Closes #41213
See merge request gitlab-org/gitlab-ce!20949
2018-11-07 15:11:30 +00:00
Grzegorz Bizon
f323d6148b
Merge branch 'max_retries_when' into 'master'
...
Allow to configure when to retry builds
Closes gitlab-runner#3515
See merge request gitlab-org/gitlab-ce!21758
2018-11-07 15:02:18 +00:00
Grzegorz Bizon
5dc0577b84
Merge branch 'triggermesh-phase1-knative' into 'master'
...
Allow to install Knative as cluster application
See merge request gitlab-org/gitlab-ce!22593
2018-11-07 15:00:38 +00:00
Douwe Maan
ad7d0cb2f4
Merge branch '43521-keep-personal-emails-private' into 'master'
...
Adds option to override commit email
Closes #43521
See merge request gitlab-org/gitlab-ce!22560
2018-11-07 13:52:08 +00:00
Grzegorz Bizon
e60e591fca
Merge branch 'touchup-ci-normalizer' into 'master'
...
Touchup Normalizer implementation
See merge request gitlab-org/gitlab-ce!22872
2018-11-07 13:48:29 +00:00
Francisco Javier López
28cbb2acfe
Add submodule update API endpoint
...
This new endpoint allow users to update a submodule's reference.
The MR involves adding a new operation RPC operation in gitaly-proto
(see gitlab-org/gitaly-proto!233 ) and change Gitaly to use this
new version (see gitlab-org/gitaly!936 ).
See gitlab-org/gitlab-ce!20949
2018-11-07 14:03:30 +01:00
Tiago Botelho
c239452b47
User can keep their commit email private
...
The private commit email is automatically generated in the format:
id-username@noreply.HOSTNAME
GitLab instance admins are able to change the HOSTNAME portion,
that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 12:24:14 +00:00
Matija Čupić
d5919aeb1f
Move extracting job names outside the loop
2018-11-07 13:09:23 +01:00
Markus Doits
b1c15f2bd4
use Ci::Build instead of CommitStatus as per feedback
2018-11-07 13:05:18 +01:00
Markus Doits
63aa35cb20
small fixes to doc and remove on whitespace noise
2018-11-07 13:05:13 +01:00
Markus Doits
9818bb5618
refactoring after latest feedback
2018-11-07 13:04:43 +01:00
Markus Doits
ff3484a0b3
remove now unneeded validation
2018-11-07 13:04:41 +01:00
Markus Doits
7c5c1e9240
fix wrong retry error messages
2018-11-07 13:04:23 +01:00
Markus Doits
b7ee04d456
refactor validations to a Entry::Retry class
2018-11-07 13:04:21 +01:00
Markus Doits
b734e3a139
one more try to reduce cognitive overhead
...
before:
- Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring.
- Method `validate_retry_when` has a Cognitive Complexity of 6 (exceeds 5 allowed). Consider refactoring.
2018-11-07 13:02:58 +01:00
Markus Doits
fdb5a51352
refactor for hopefully lower cognitive complexity
...
before:
- Method `validate_retry` has a Cognitive Complexity of 7 (exceeds 5 allowed). Consider refactoring.
- Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring.
- Method `validate_retry_when` has a Cognitive Complexity of 14 (exceeds 5 allowed). Consider refactoring.
2018-11-07 13:02:56 +01:00
Markus Doits
ffcc200a68
fix allowed keys validator to use correct attribute as error base?
2018-11-07 13:01:57 +01:00
Markus Doits
0db50a808d
update job config validator to validate new retry syntax
2018-11-07 13:01:53 +01:00
Matija Čupić
126fbe580f
Return untouched hash if no job is parallelized
2018-11-07 13:01:33 +01:00
Douwe Maan
a82a595728
Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'
...
Comment on any expanded diff line on MRs
See merge request gitlab-org/gitlab-ce!22398
2018-11-07 11:56:46 +00:00
Grzegorz Bizon
6f6cd4f43d
Merge branch '21480-parallel-job-keyword-mvc' into 'master'
...
Resolve "`parallel` job keyword MVC"
Closes #21480
See merge request gitlab-org/gitlab-ce!22631
2018-11-07 10:38:05 +00:00
Filipa Lacerda
b1fae097bd
Merge branch 'winh-delayed-jobs-dynamic-timer' into 'master'
...
Add dynamic timer to delayed jobs
See merge request gitlab-org/gitlab-ce!22382
2018-11-07 10:27:54 +00:00
Winnie Hellmann
390abbf054
Add placeholder for remaining time in delayed job tooltips
2018-11-07 10:00:25 +01:00
Sean McGivern
1b788c66a1
Merge branch 'sh-fix-issue-52649' into 'master'
...
Fix statement timeouts in RemoveRestrictedTodos migration
Closes #52649
See merge request gitlab-org/gitlab-ce!22795
2018-11-07 06:51:48 +00:00
gfyoung
7e6f6e1603
Enable even more frozen string in lib/gitlab
...
Enables frozens string for the following:
* lib/gitlab/conflict/**/*.rb
* lib/gitlab/cross_project_access/**/*.rb
* lib/gitlab/cycle_analytics/**/*.rb
* lib/gitlab/data_builder/**/*.rb
* lib/gitlab/database/**/*.rb
* lib/gitlab/dependency_linker/**/*.rb
* lib/gitlab/diff/**/*.rb
* lib/gitlab/downtime_check/**/*.rb
* lib/gitlab/email/**/*.rb
* lib/gitlab/etag_caching/**/*.rb
Partially addresses gitlab-org/gitlab-ce#47424 .
2018-11-06 22:47:32 -08:00
Douglas Barbosa Alexandre
5c519d1194
Add a helper method to append path to a base URL
...
In Ruby 2.4, `URI.join("http://test// ", "a").to_s` will
remove the double slash, however it's not the case in
Ruby 2.5. Using chomp should work better for the intention,
as we're not trying to allow things like ../ or / paths
resolution.
This helper method append path to host, making sure
there's one single slash as path separator.
2018-11-06 21:32:01 -08:00
Chris Baumbauer
26673cc827
Fix double-negation
2018-11-06 12:06:37 -08:00
Chris Baumbauer
008126a878
Refactor preinstall/postinstall methods in the helm installer
2018-11-06 12:00:16 -08:00
Oswaldo Ferreira
1bc0e9e3c5
Apply additional guard-clauses for unfold_required?
2018-11-06 17:59:09 -02:00
Oswaldo Ferreira
ec66ef1b74
Comment on any expanded diff line on MRs
2018-11-06 17:39:31 -02:00
Matija Čupić
2adfbf1c66
Avoid creating intersection if there's no array
2018-11-06 18:44:01 +01:00
Matija Čupić
4ba960c17d
Use instance based approach for Normalizer
2018-11-06 18:35:44 +01:00
Matija Čupić
f48261a409
Refactor Normalizer specs
2018-11-06 18:23:45 +01:00
Rémy Coutable
ea3b8864e8
Merge branch 'unindirect-fetch-remote' into 'master'
...
Stop Repository#fetch_remote from using Gitlab::Shell
See merge request gitlab-org/gitlab-ce!22635
2018-11-06 16:42:17 +00:00
Nick Thomas
668e5d63fa
Stop Repository#fetch_remote from using Gitlab::Shell
...
This indirection doesn't provide any value, so remove it
2018-11-06 12:42:00 +00:00
Kamil Trzciński
1cf4aa0239
Merge branch 'stateful_deployments' into 'master'
...
Change life cycle of `deployments` records in order to make it a stateful object
See merge request gitlab-org/gitlab-ce!22380
2018-11-06 12:36:13 +00:00
Mayra Cabrera
477d2e1a47
Add background migration for Kubernetes Namespaces
2018-11-06 12:23:00 +00:00
Rémy Coutable
b4ecbef24d
Merge branch '18933-render-index-like-readme' into 'master'
...
Render index.* like README.* when it's present in a directory
Closes #18933
See merge request gitlab-org/gitlab-ce!22639
2018-11-06 11:02:13 +00:00
Chris Baumbauer
97441486ce
Fix issue with missing knative cluster role binding, and cleanup tests
2018-11-05 23:55:18 -08:00
Shinya Maeda
b3020aaffd
Squashed commit of the following:
...
commit 931d6ab0e025b0268d94e455f736b09a025e0578
Merge: b34d165320d 93846eb152
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Nov 5 09:36:58 2018 +0900
Merge branch 'master-ce' into stateful_deployments
commit b34d165320d6f3298c8b776ba66270a59c217412
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Nov 2 18:07:08 2018 +0900
Fix flaky spec
commit b5e0527c5d
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Nov 2 15:32:03 2018 +0900
Fix spec
commit f78a5e96e6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Nov 2 14:59:29 2018 +0900
Remove unnecessary line in schema.rb
commit 6ce7c483e0
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Nov 2 14:55:48 2018 +0900
Add partial index for filling deployment at migration
commit aecccfb511
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Nov 2 14:42:24 2018 +0900
Fix fill empty finished at migration
commit 0199e1761a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Nov 2 14:19:44 2018 +0900
Fix flaky spec
commit 56ac84cd80
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Nov 2 10:06:49 2018 +0900
Fix guard clause to prevent multiple deployments to a job
commit 521561b6b3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 20:19:24 2018 +0900
Fix spec
commit 2878da0d29
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 19:38:59 2018 +0900
Simplify the factory
commit 22fd7df021
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 19:33:50 2018 +0900
Simplify the Deployable and BuildSuccessWorker
commit 4110895967
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 18:34:20 2018 +0900
Fix spec
commit ae75fe7461
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 17:19:12 2018 +0900
Fix weird virtual deployment status
commit 380fee7494
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 15:59:31 2018 +0900
Fix spec
commit 29889fcbaa
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 15:07:10 2018 +0900
Fix coding offence
commit 36ac13f345
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 14:22:17 2018 +0900
Squashed commit of the following:
commit ba9aede922e1643db3f06c56736d46d6d86d356b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 14:21:33 2018 +0900
Fix ambiguious factory specification in update deployment service spec
commit 013afb5668cb30dc4ca5b21945c17b341e7ea7f9
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 1 14:10:24 2018 +0900
Fix spec
commit 78793670d049e2dfb5fc98177eb4d10f20b9310b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 31 18:26:12 2018 +0900
Fix spec
commit 73d27e87c66698f2e3a817bb8728f02475b7ba4f
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 31 16:22:14 2018 +0900
Fix index
commit 8580a226ea68bf5e49b35bfb5f404968bbfaf8e9
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 31 15:34:57 2018 +0900
Fix deployment relationships in Ci::Build
commit d6d28b55afd1179200b4f5188e0b53079ff3c1a7
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 31 15:27:53 2018 +0900
Fix spec
commit 94eb754e2e1bb9a1fe627f86823f571a8298d27b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 31 14:07:11 2018 +0900
Fix spec
commit 0b30f80bcd08a7a06bdde3378ec1733f865284be
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 20:15:31 2018 +0900
Fix spec
commit 466bdcdb6af8cdb475c9fa16bd7d1dff23b11e40
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 19:28:51 2018 +0900
Fix spec
commit a7c3caac99139e70fe3f1f3d14856939fa25c527
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 17:33:47 2018 +0900
Fix factory
commit cea28ae100532e6711ce1d22676719a94e2da8a0
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 16:28:18 2018 +0900
Drop leagacy success
commit 3785d685eabc10b6597cf3db67bf08385ccf298a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 15:37:28 2018 +0900
Remove unnecessary migration file
commit 0d597fa46eeffdbb9a4afb53005a8183e433c6bf
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 15:35:53 2018 +0900
Fix schema.rb
commit ec3c2abc6944e09f6410468ae5e356865ec7b02b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 15:34:21 2018 +0900
Rename post migration file
commit 0e7281885a84656acf95f0f423732680f8fec076
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 15:31:01 2018 +0900
Remove include EnumWithNil
commit b3846d59c07e07275126c70361bde7f30810729e
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 15:05:50 2018 +0900
Decouple action
commit c9f9ba4eae9ca1edc7d8751e1d2e0572cb222d9c
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 14:23:29 2018 +0900
Remove status mock
commit d95bfea1ca67b3a27a3226a669c2b1266d696682
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 14:17:14 2018 +0900
Add action
commit 0cec39e0f76c22a18498f46d65ad7226fb30c3f8
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 30 13:44:07 2018 +0900
Remove unnecessary line in schema.rb
commit 7b4c5f8e1b00dd8e6aa944352f9d8a9f3ae6f1c7
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 29 19:59:41 2018 +0900
Revert build success worker
commit 0c52ffa4a23eea488c187317e8b400369846f399
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 29 19:11:47 2018 +0900
Use add_column_with_default properly
commit ba9bae357da5dfd2f6ec05f7f9db9d0b31224f48
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 29 18:40:55 2018 +0900
Fix with_status
commit 75dffc97b9c5f6fa73d9d09b125c8f849fa2caae
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 29 16:26:56 2018 +0900
Remove unnecessary line in schema.rb
commit 25188ccc52fb29ca63b9205c4d95ffc2e0afadee
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 29 16:26:17 2018 +0900
Set default values in regular migration
commit 98ea037fbf39c8d9f0db77fb50e2d08382425158
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 26 17:27:49 2018 +0900
Fix static analysis
commit e7d1765f77f9ff9b94a34985a7855bdaab1da675
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 26 16:37:10 2018 +0900
Remove empty spec
commit 0033f521ed1eae8117dba231961aa47c068bbcfb
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 26 16:34:55 2018 +0900
Simplify spec changes
commit 0be4c6b3ade6d9a8bf28bcd177c66ebd7bb7d20a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 26 16:32:45 2018 +0900
Simplify spec changes
commit a93d25d79df7e25bdf688fc938c712922f9dc4df
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 26 16:02:31 2018 +0900
Fix flaky spec
commit 339ad50cf471ca706b29f008ccd2bb881dd5b776
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 26 15:06:22 2018 +0900
Rename Deployments Success worker
commit bd69c78085adcb9b0f8ff9b7041ae355953ad7ab
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 26 14:43:03 2018 +0900
Fix coding offence
commit 004748b2a9c5236ec13eb01289418f3d6571c92c
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 20:09:10 2018 +0900
Rename to update deployment service
commit b04a85e761de501f030f3844fd485a2b9e46f7f7
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 18:46:52 2018 +0900
Add spec for Project
commit 548af23a5a07f0c20b72849d03aa0b98a0b49134
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 18:43:25 2018 +0900
Fix spec
commit c977e4d3f17194c46a1bf857b473017ce21ef7e9
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 17:58:07 2018 +0900
Add spec for Environment
commit 73feb9010f8d8093bee4b46e56d30cfef3e8e34a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 17:39:24 2018 +0900
Add spec for Deployment model
commit 9a3cfbf766f402571588839375cf311bb9807035
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 17:18:02 2018 +0900
Fix statis analysis
commit a30d28dbc631a29855883ca89c592a10c012f1d2
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 17:17:32 2018 +0900
Ignore nil instance
commit fa6fdd89f380e588a6bcf14b1f9aef0d14d3854b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 16:20:40 2018 +0900
Add spec for deployable concern
commit aa91186821dc671df2c7a641e37586dd5dfc1008
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 15:37:23 2018 +0900
Clean up deployable
commit 34d3e18731f7906a3db250b105a64d1db83c2fca
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 15:13:05 2018 +0900
Fix 17 cycle analytics
commit 8dc9e00408f9b390175e7d5ea743eed4fb9e3f79
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 25 13:56:51 2018 +0900
Fix static analysys
commit 5c4175807a537bafc4b889b0a97e8f96f0e483cd
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 24 15:05:05 2018 +0900
Skip unnecessary sidekiq worker
commit 9d8b5d423f49cc247c96ce3767d03b4af305809f
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 24 14:53:13 2018 +0900
Add changelog
commit c8cabba496722240cadf7c161c80bceb09727cba
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 24 14:44:45 2018 +0900
Squashed commit of the following:
commit f7643885ac2329e18d690a4e4f2d7614b732c793
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 19:38:45 2018 +0900
Fix deployment widget specs
commit 03bd04b5c98b634dff6a0ab4292c150a9031995c
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 17:50:16 2018 +0900
Fix env status spec
commit 4a49c6502b161a12f0f62d5ec167dff777047dab
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 17:48:59 2018 +0900
Fix environment spec
commit 4044822887987e20a703990ff20352a532eeb965
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 17:47:17 2018 +0900
Fix environment spec
commit 9939d44b7eb9da371de74c0f04fed1eb3db37ad3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 15:45:43 2018 +0900
Add a new spec for deployment success worker
commit f61c4d3657b5ef13b5da171460da68a6643ad4b5
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 15:38:11 2018 +0900
Fix cycle analytics helper
commit b6242615e8298fb7fc047c8df8006c25ad717c70
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 14:41:54 2018 +0900
Fix cycle analysis helper
commit 9a001cb4c4ed6f3b87dc612bdffc60a6b2b0a132
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 14:37:08 2018 +0900
Ignore coding offence in build success worker's spec
commit 1fb88583025bac8a56172cbd59be04258ea4c5f3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 23 14:33:11 2018 +0900
Added more spec for deployments
commit 1a6ba97ababbf62e8dd0ae0c56d75ab1268fd0ce
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 19:36:50 2018 +0900
Move after create hookd into success worker
commit 09de5fed5d6f108423779cf9d9e7f1d21f3c1c91
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 19:30:06 2018 +0900
Fix build spec
commit 73a55cbcabbb1e928eca3e53e8ff75dec178bc90
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 19:08:43 2018 +0900
Fix update_deployment_metrics_service_spec.rb
commit ee05136a02ae9fa348b4b89b9a69937ebb9697dd
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 17:32:05 2018 +0900
Remove unnecessary degelate
commit e246ddeebc01a807ccc36fdb484c3e72ad91e680
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 16:07:39 2018 +0900
Remove unnecessary optimistic locking
commit dcc225c8237b90e3bc8dcc3dc2e3252e0b0be093
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 16:00:22 2018 +0900
Simplify status replication
commit 13a5fd7afb67ba2712fcaecaea5fedf05f9ad177
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 15:29:24 2018 +0900
Fix sidekiq queue names
commit dcc796f48d523538e1c91b9cd3e1c7065e5329b1
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 15:23:55 2018 +0900
Revert success check in update_merge_request_metrics
commit 129ef083d637d4acb8c97a6d9ab96deb2ff6efcd
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 15:18:31 2018 +0900
Fix queue name of deployment success worker
commit 10fe5a6484f4f02322ce5bb16844fc7b1d565963
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 15:09:42 2018 +0900
Introduce deployable module
commit d91260bbe105bf46f6c06d9e9593c8c4cd5139cf
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 14:05:31 2018 +0900
Add database index for successful deployments
commit 74274147263de4b60870065a19935498ce662e30
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Oct 22 13:51:59 2018 +0900
Fix invalid state transition
commit ff18463cc847bf3cf5a3e49f3651eedfdf67c7e6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 19 20:05:15 2018 +0900
Fix coding style offence
commit 0202c0f5b631601edab7b359b087b307f5eb7ba3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 19 18:34:07 2018 +0900
Target only successful deployments from other relations
commit 1f2758cb030dec1df5dda30f6bc3e25b6d0841c9
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 19 18:21:28 2018 +0900
Add namespace explicitly
commit 3d9227b6e5642cecde88d4edac925125f6474b11
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 19 17:42:30 2018 +0900
Fix spec in DeleteInconsistentInternalIdRecords
commit 3e0cc99ff6c5c7188511618228a6ec027752ce69
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 19 16:10:16 2018 +0900
Fixed spec
commit 8de09b8bb31f7b9f24ecdf9f2dd8ef358a260263
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Oct 19 14:22:35 2018 +0900
Fix create deployment service
commit 31957570b4444492eeb412e765f96a56416c25f3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 18 20:21:26 2018 +0900
Move CreateDeploymentService. Fix Cycle analytics spec and fixture.
commit d2eb433a1bb9710c0d4778c4f34c12b6b64f60e6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 18 20:11:22 2018 +0900
Fix build success worker
commit 25e6cd87138bcdb69de8785ca367e479c8dbcc59
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 18 19:49:13 2018 +0900
Fix create deployment service spec
commit d268bf410bf65e86c81eb76d50aa8e145b32d249
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 18 19:01:23 2018 +0900
Fix cycle analysys spec's deployment
commit 525ade8aa1e4394ed8a759bb0437e407fbe74a35
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 18 18:24:04 2018 +0900
Fix factory to set legacy status by default
commit c6a990821ac0a1ffa49e20e2d78d94b8ce075914
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Oct 18 17:25:40 2018 +0900
Remove unnecessary lib from deployment
commit a6107e0e85ac26ee09da3316ebc11de32f067d82
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 17 17:38:58 2018 +0900
Fix recursive call
commit 15c5f3b64061a75af3c3039ca7f49b1cc4ff3068
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 17 17:30:44 2018 +0900
Add finished_at
commit c8d3d70366f694d78acb7e30d342c7697798b922
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 17 15:55:31 2018 +0900
Fix last_deployment methods as it used to return successful deployment always
commit 96bbe8670cece021766fde95fe573cbbe23d1e55
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 17 15:49:57 2018 +0900
Redefine statuses
commit c86a9d0bd2ab3e7a00bf61f094a96ee99b76b289
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 17 14:50:27 2018 +0900
Fix schema.rb
commit 9ff5f0eaafbc08795018c7bb282b19f6327dee21
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Oct 17 14:18:04 2018 +0900
Default status nil to success
commit 5928bd9bb94e1e8908ed1561e01595be84d5f4ec
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Oct 16 15:13:48 2018 +0900
Add status to Deployment
2018-11-06 10:54:27 +09:00
Grzegorz Bizon
487820ad50
Merge branch 'disallow-retry-of-old-builds' into 'master'
...
Disallow retry of old builds
Closes #50939
See merge request gitlab-org/gitlab-ce!22538
2018-11-05 15:32:14 +00:00
Matija Čupić
4b2b154c4e
Refactor Gitlab::Ci::Config::Normalizer
...
Use Hash#each_with_object to manipulate job hashes.
2018-11-05 15:53:37 +01:00
Kamil Trzciński
40397f3577
Allow to make builds soft-archived.
...
The soft-archived builds cannot be run after some deadline time.
The intent is to aggressively recycle old builds after sometime.
2018-11-05 15:51:57 +01:00
Matija Čupić
5fd8933d97
Use instance based approach for Normalizer
2018-11-05 14:36:52 +01:00
Sean McGivern
19c5468a27
Merge branch '52300-pool-repositories' into 'master'
...
Start tracking pool repositories
Closes #38238 and #52300
See merge request gitlab-org/gitlab-ce!22482
2018-11-05 13:25:39 +00:00
Kamil Trzciński
e083e28eac
Merge branch '53450-wrong-value-for-kubernetes_version-variable' into 'master'
...
Bump KUBERNETES_VERSION to latest 1.10 series
Closes #53450
See merge request gitlab-org/gitlab-ce!22757
2018-11-05 09:49:04 +00:00
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
Nick Thomas
270155d655
Start tracking pool repositories
2018-11-05 01:40:29 +00:00
Philippe Lafoucrière
ccb1ff9aca
Update license_management job
2018-11-04 22:48:05 +00:00
Stan Hu
5c8ce94052
Fix statement timeouts in RemoveRestrictedTodos migration
...
On GitLab.com, the RemoveRestrictedTodos background migration
encountered about 700+ failures a day due to statement timeouts.
PostgreSQL might perform badly with a LIMIT 1 because the planner is
guessing that scanning the index in ID order will come across the
desired row in less time it will take the planner than using another
index. The order_hint does not affect the search results. For example,
`ORDER BY id ASC, updated_at ASC` means the same thing as `ORDER BY id
ASC`.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52649
2018-11-04 06:01:17 -08:00
Chris Baumbauer
c10452d285
Resolve issues raised by Kamil
2018-11-03 10:48:48 -07:00
Chris Baumbauer
aa44393e8f
Merge branch 'master' into triggermesh-phase1-knative
2018-11-03 10:13:35 -07:00
Thong Kuah
9f206e17f1
Bump KUBERNETES_VERSION to latest 1.10 series
...
This allows us to use a kubectl binary that should be able to
connect to Kubernetes clusters v1.9 and up.
2018-11-04 00:09:43 +13:00
Amit Rathi
8837519445
Pushing WIP state for backup
2018-11-03 09:08:21 +05:30
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
Chris Baumbauer
dc078c2417
Merge branch 'master' into triggermesh-phase1-knative
2018-11-02 08:39:25 -07:00
James Lopez
0846e8a6f5
Remove extra whitespace on markup_helper.rb
2018-11-02 15:10:41 +00:00
Matija Čupić
a8da523847
Refactor Gitlab::Ci::Config::Normalizer
2018-11-02 15:48:25 +01:00
James Lopez
ccb706d346
Refactor MarkupHelper to add INDEX plain filename
2018-11-02 14:32:05 +00:00
Matija Čupić
8a6a312db8
Make Rubocop and Danger happy
2018-11-02 14:20:27 +01:00
Achilleas Pipinellis
be0af5e69f
Test type of README file without extension
2018-11-02 12:26:04 +01:00
Jakub Jirutka
cb3f851098
Render index.* like README.* when it's present in a directory
...
Resolves #18933
2018-11-02 12:20:50 +01: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
Matija Čupić
73e17446ef
Move parallelized node index to job options
2018-11-01 16:18:27 +01:00
Chris Baumbauer
28a9bbceb7
Remove comments from migration script and add usage data
2018-11-01 08:14:49 -07: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
Matija Čupić
56a08d233f
Parallelize jobs in Gitlab::Ci::YamlProcessor
2018-11-01 01:05:42 +01:00
Douglas Barbosa Alexandre
01d8c1f6f0
Whitelist none method from ActiveRecord::Querying
2018-10-31 15:46:36 -03:00
Matija Čupić
3c8dd4ccbf
Move parallelization to Ci::Config::Normalizer
2018-10-31 19:11:45 +01:00
Matija Čupić
8f8a89f98e
Implement POC config based parallelization
2018-10-31 15:27:51 +01: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
Matija Čupić
94923328fd
Revert Seed based parallelization implementation
...
Revert "Add Build seed specs"
This reverts commit 03bc722ea1 .
Revert "Add build specs"
This reverts commit c2d49565cf .
Revert "Refactor parallelization implementation"
This reverts commit 72430483de .
Revert "Implement POC for job parallelization"
This reverts commit 44b740f99d .
2018-10-30 15:06:00 +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
Chris Baumbauer
0ddff09385
Revert Helm version bump
2018-10-29 10:56:46 -07:00