f0212cd32b
Update Clair Version V8 to V11
2019-07-10 10:46:47 +00:00
bee24c85c0
Propagate python version variable
2019-07-10 06:27:18 +00:00
073c8b25ea
GraphQL support for Notes created in discussions
...
A new `discussion_id` argument on the `createNote` mutation allows
people to create a note within that discussion.
The ability to lazy-load Discussions has been added, so
GraphQL.object_from_id can treat Discussions the same as AR objects and
batch load them.
https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
https://gitlab.com/gitlab-org/gitlab-ee/issues/9489
2019-07-10 12:13:48 +12:00
306c8caa2c
Merge branch 'fix-unicorn-sampler-workers-count' into 'master'
...
Make unicorn_workers to return meaningful results
Closes #63659
See merge request gitlab-org/gitlab-ce!30506
2019-07-09 21:34:03 +00:00
5305d5267d
Disabling can_use_disk? temporarily
2019-07-09 11:14:57 -07:00
580368c09b
Make unicorn_workers to return meaningful results
2019-07-09 16:06:15 +02:00
639ab5214c
Remove `:graphql` feature flag
...
- Remove `FeatureConstrainer` call wrapping api endpoint
- Remove `Feature.enabled?(:graphql)` conditionals in back and frontend
- Modify graphql test to be graphql flag agnostic
- Remove api routing spec
- Remove frontend feature flag via `gon`
2019-07-09 12:45:23 +00:00
630a8e8050
Merge branch 'fix-median-counting-for-cycle-analytics' into 'master'
...
Add additional condition to count median properly
See merge request gitlab-org/gitlab-ce!30229
2019-07-09 12:22:18 +00:00
a87e2c99dc
Merge branch 'patch-29' into 'master'
...
Updates to php:latest
See merge request gitlab-org/gitlab-ce!30319
2019-07-09 10:47:39 +00:00
12422dbf10
Merge branch 'remove-comment-from-auto-deploy-yml' into 'master'
...
Remove obsolete comment
See merge request gitlab-org/gitlab-ce!30388
2019-07-09 10:19:02 +00:00
9062c9f11b
Push feature flag for embedding metrics
2019-07-09 04:04:59 +00:00
f00c1718e9
Updates to php:latest
2019-07-08 16:43:13 -07:00
7c7b8f32a7
Merge branch 'jc-detect-nfs-for-rugged' into 'master'
...
Use Rugged if we detect storage is NFS and we can access the disk
See merge request gitlab-org/gitlab-ce!29725
2019-07-08 13:35:43 +00:00
5b73183781
Merge branch 'zj-praefect-config-gitlab-yml' into 'master'
...
Remove a high cardinality Prometheus metric
See merge request gitlab-org/gitlab-ce!30122
2019-07-08 11:38:36 +00:00
5214ad1a7f
Merge branch '40379-CJK-search-min-chars' into 'master'
...
Remove minimum required characters for fuzzy search if no trigram is used
See merge request gitlab-org/gitlab-ce!29810
2019-07-08 09:49:43 +00:00
357f9898d5
Add OpenSSL::OpenSSLError to HTTP_ERRORS
...
Some services can raise OpenSSL::X509::CertificateError due
to an invalid SSL certificates, with OpenSSL::OpenSSLError
we can handle these errors.
2019-07-05 21:05:24 +00:00
8152e1aa4a
Use Rugged if we detect storage is NFS and we can access the disk
...
Add a module we use as a singleton to determine whether or not rails is
able to access the disk
2019-07-05 10:31:47 -07:00
9d98eb0435
Merge branch 'create-merge-train-ref-ce' into 'master'
...
CE Port: Extend `MergeToRefService` to create merge ref from an arbitrary ref
See merge request gitlab-org/gitlab-ce!30361
2019-07-05 13:28:11 +00:00
031e91beeb
Remove high cardinality Prometheus metric
...
The metric was used to correlate Gitaly requests to the Rails controller
and action combination. However, Kibana provides better observability in
this specific metric, and can handle hig cardinality much better.
There's no dashboard in Grafana that currently depends on this metric
being exposed.
2019-07-05 14:40:13 +02:00
6ef6693e37
Refactor PositionTracer to support different types
...
This is to prepare for supporing image type position tracing
2019-07-05 11:03:47 +00:00
48307fac1e
Extend MergeToRefService for creating merge ref from the other ref
...
Currently, MergeToRefService is specifically designed for
createing merge commits from source branch and target branch of
merge reqeusts. We extend this behavior to source branch and any
target ref paths.
2019-07-05 17:15:10 +07:00
1391ba13b7
Update SAST.gitlab-ci.yml w/ FAIL_NEVER ENV
...
https://gitlab.com/gitlab-org/gitlab-ee/issues/10564
2019-07-05 08:50:39 +00:00
2fec78ead4
Merge branch 'if-6990-enforce_smartcard_session_for_git_and_api' into 'master'
...
CE port of "Require session with smartcard login for Git access"
See merge request gitlab-org/gitlab-ce!30384
2019-07-05 08:08:24 +00:00
2e74680358
Merge branch '58409-increase-graphql-complexity-for-fields-that-make-gitaly-calls' into 'master'
...
Increase GraphQL complexity for fields that make Gitaly Calls
Closes #58409
See merge request gitlab-org/gitlab-ce!28814
2019-07-05 07:46:17 +00:00
6e55298124
Remove obsolete comment
2019-07-05 07:07:46 +00:00
b9b3ec8354
CE port of "Require session with smartcard login for Git access"
2019-07-05 08:12:29 +02:00
675c9b9f6b
Address reviewer comments
...
- Remove Gitaly call check for fields that have a constant complexity
declared
- Add associated test
2019-07-05 10:18:50 +12:00
2ecad462a0
Add where condition to count in median class
2019-07-04 23:11:45 +02:00
37e4d6d991
DRY up conditions for files require DB review
...
Stop using two separate lists for the conditions which files require a
database review.
Related discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30156#note_187732053
2019-07-04 18:47:16 +00:00
4f04c4c90b
Ignore min_chars_for_partial_matching unles trigrm
...
If we're not using a trigram index, then ignore the
min_chars_for_partial_matching setting
2019-07-04 10:56:13 -06:00
eaa6edbff3
Merge branch '54117-transactional-rebase' into 'master'
...
Allow asynchronous rebase operations to be monitored
Closes #54117
See merge request gitlab-org/gitlab-ce!29940
2019-07-04 16:30:40 +00:00
c433082f89
Change 'Todo' to 'To Do'
...
Currently, we label items to be done as "Todo." This is grammatically
incorrect and (therefore) confusing—especially to our Spanish-speaking
users for whom "todo" has a specific and unrelated meaning.
We should use "To Do" and always use it as singular (not "To Dos").
Updates to wording in a few places per MR (ee) discussion
Updating locale/gitlab.pot
Updates to wording in a few places per MR (ee) discussion
Updating locale/gitlab.pot
2019-07-04 15:45:54 +00:00
04962880ad
Fix process start time
...
Previously we were recording process start time as seconds from boot.
This makes it so we record as epoch time.
2019-07-04 10:24:19 +00:00
ae7041d4da
Backports for EE's "Allow adding groups to CODEOWNERS file"
...
Some general code has been added/removed in EE version
which needs to be backported in CE
2019-07-04 09:13:50 +00:00
381468d0cc
Allow asynchronous rebase operations to be monitored
...
This MR introduces tracking of the `rebase_jid` for merge requests. As
with `merge_ongoing?`, `rebase_in_progress?` will now return true if a
rebase is proceeding in sidekiq.
After one release, we should remove the Gitaly-based lookup of rebases.
It is much better to track this kind of thing via the database.
2019-07-04 08:50:55 +01:00
9ef0c8559d
Clarify documentation of Gitlab::SidekiqStatus
...
The "running" state is ambiguous. Clarify that it covers both enqueued
and actually running jobs.
2019-07-04 08:45:14 +01:00
d0b76d0652
Cache PerformanceBar.allowed_user_ids list locally and in Redis
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-07-03 18:47:30 +02:00
eaf58debac
Only save Peek session in Redis when Peek is enabled
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-07-03 16:02:42 +02:00
d427c05f58
Merge branch 'asciidoc-syntax-highlighting' into 'master'
...
Enable AsciiDoc syntax highlighting (using Rouge)
Closes #32635
See merge request gitlab-org/gitlab-ce!29835
2019-07-03 13:03:08 +00:00
cf1b0d10bc
Address reviewer comments
...
- Add 1 for all fields that call Gitaly (with resolvers or without)
- Clarify comment regarding Gitaly call alert
- Expose predicate `calls_gitaly?` instead of ivar
2019-07-03 22:53:13 +12:00
a11fe5de44
Wrap proc properly in gitaly call counts
...
- Add `calls_gitaly: true` to some fields missing (hey, it works!)
- Clarify proc wrapping
- Add kwargs argument to `mount_mutation`
2019-07-03 22:53:13 +12:00
f4890d9078
Alert if `calls_gitaly` declaration missing
...
- Move `calls_gitaly_check` to public
- Add instrumentation for flagging missing CallsGitaly declarations
- Wrap resolver proc in before-and-after Gitaly counts to get the net
Gitaly call count for the resolver.
2019-07-03 22:53:13 +12:00
c20c9e2940
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2019-07-03 11:55:56 +02:00
49d689fb3c
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2019-07-03 11:55:42 +02:00
e555db6f28
Merge branch '44990-remove-old-i' into 'master'
...
Remove old migration specs that violate FactoriesInMigrationSpecs
See merge request gitlab-org/gitlab-ce!30280
2019-07-03 09:19:17 +00:00
7ecffe2987
Show upcoming status for releases
...
Add released_at field to releases API
Add released_at column to releases table
Return releases to the API sorted by released_at
2019-07-03 09:12:15 +00:00
48e5cc536c
Add URL comments to Auto DevOps template
...
This will make it more obvious to anyone looking to customize these
files what the source code actually is.
2019-07-03 00:54:59 +00:00
28ac2d3049
Remove old migrations and specs
...
This removes old migrations that violate the
FactoriesinMigrationSpecs cop
2019-07-03 03:55:56 +08:00
2e909cb6df
LC_ALL=C.UTF-8
2019-07-02 09:35:06 -07:00
e07ebe66af
Merge branch '59177-squash-old-migrations' into 'master'
...
Squash old migrations
Closes #59177
See merge request gitlab-org/gitlab-ce!30226
2019-07-02 13:14:24 +00:00
Can Eldem
Luke Duncalfe
Stan Hu
John Cai
Kamil Trzciński
charlie ablett
Andreas Brandl
Grzegorz Bizon
Sean McGivern
Sarah Yasonik
Paul Giberson
Dmitriy Zaporozhets
Bob Van Landuyt
Douglas Barbosa Alexandre
Douwe Maan
Zeger-Jan van de Weg
Patrick Bajao
Shinya Maeda
Lucas Charles
Thong Kuah
Imre Farkas
Małgorzata Ksionek
Toon Claes
Mario de la Ossa
Christie Lenneville
Ryan Cobb
Igor
Nick Thomas
Rémy Coutable
Marin Jankovski
Jason Goodman
Dylan Griffith
Heinrich Lee Yu
Pat Myron