d73e68deb5
Limit the action suffixes in transaction metrics
...
There seem to be a lot of cases where the suffix of an action (e.g.
".html") is set to bogus data, such as "*/*" or entire URLs. This can
increase cardinality of our metrics, and isn't very useful for
monitoring and filtering. To work around this, we enforce a whitelist
containing a few suffixes we actually care about. Suffixes not supported
will be grouped under the action without a suffix. This means that a
request to "FooController#bar.jpeg" will be assigned to
"FooController#bar".
2018-06-20 14:35:04 +02:00
5841e92390
Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible with Tiller v2.7.0'"
2018-06-20 12:10:14 +00:00
cc061cd1c6
fix some more edge cases
2018-06-20 11:57:22 +02:00
329b00672d
Merge branch 'ce-5024-filename-search' into 'master'
...
Implement filtering by filename on code search
Closes #43627
See merge request gitlab-org/gitlab-ce!19509
2018-06-20 09:20:27 +00:00
c67d8c2478
Merge branch 'zj-lfs-pointers' into 'master'
...
LFS changes are detected by Gitaly
Closes gitaly#935
See merge request gitlab-org/gitlab-ce!19995
2018-06-20 08:29:47 +00:00
7357209f91
Implement filtering by filename on code search
2018-06-19 09:30:09 -06:00
825c68e2ed
fix some edge cases
2018-06-19 17:08:02 +02:00
c0f0ccf222
Merge branch 'zj-force-push-opt-out' into 'master'
...
Force push is handled by Gitaly now
Closes gitaly#348
See merge request gitlab-org/gitlab-ce!19992
2018-06-19 14:19:18 +00:00
38edd5c33e
Merge branch 'zj-fork-mandatory' into 'master'
...
Move forking to Gitaly
Closes gitaly#817 and gitaly#1236
See merge request gitlab-org/gitlab-ce!19990
2018-06-19 14:00:22 +00:00
64cda7746c
LFS changes are detected by Gitaly
...
Closes https://gitlab.com/gitlab-org/gitaly/issues/935
2018-06-19 15:59:27 +02:00
c2cdefd441
Force push is handled by Gitaly now
...
Closes gitlab-org/gitaly#348
2018-06-19 15:35:17 +02:00
b0fadeee83
Merge branch 'zj-counting-commits' into 'master'
...
Counting commits is done by Gitaly
Closes gitaly#382
See merge request gitlab-org/gitlab-ce!19983
2018-06-19 12:45:49 +00:00
d6c57146c5
Merge branch 'sh-optimize-locks-check-ce' into 'master'
...
Eliminate N+1 queries in LFS file lock checks during a push
See merge request gitlab-org/gitlab-ce!19978
2018-06-19 11:40:52 +00:00
1dc0332726
Move forking to Gitaly
...
Closes https://gitlab.com/gitlab-org/gitaly/issues/817
Closes https://gitlab.com/gitlab-org/gitaly/issues/1236
2018-06-19 13:30:54 +02:00
f70c581d1f
Merge branch 'zj-linguist-gitaly-mandatory' into 'master'
...
Move language detection to mandatory
Closes gitaly#732 and gitaly#360
See merge request gitlab-org/gitlab-ce!19985
2018-06-19 09:56:45 +00:00
7a42d86581
Merge branch 'zj-gitaly-license-detection' into 'master'
...
License detection happens solely through Gitaly now
Closes gitaly#1026
See merge request gitlab-org/gitlab-ce!19986
2018-06-19 09:55:13 +00:00
fe56d29d30
update spec
2018-06-19 11:25:58 +02:00
c24e39ab88
Counting commits is done by Gitaly
...
Closes https://gitlab.com/gitlab-org/gitaly/issues/382
2018-06-19 10:37:51 +02:00
b99bc6d380
add group finder spec and logic
2018-06-19 09:54:47 +02:00
41d01281ce
Merge branch 'rs-spec-lib-gitlab-ci-parity' into 'master'
...
Extract EE specific files/lines for spec/lib/gitlab/ci
See merge request gitlab-org/gitlab-ce!19971
2018-06-19 07:37:28 +00:00
da8419a1ba
License detection happens soley through Gitaly now
...
Migration: https://gitlab.com/gitlab-org/gitaly/issues/1026
Conflicts:
lib/gitlab/git/repository.rb
2018-06-19 09:35:15 +02:00
9ae8b57467
Move language detection to mandatory
...
Closes https://gitlab.com/gitlab-org/gitaly/issues/732
Closes https://gitlab.com/gitlab-org/gitaly/issues/360
2018-06-19 09:29:54 +02:00
0f18d4896c
Merge branch 'rails5-nil-formats' into 'master'
...
Fix nil formats test
Closes #47833
See merge request gitlab-org/gitlab-ce!19941
2018-06-19 07:27:01 +00:00
4f9068dfc0
Eliminate N+1 queries in LFS file locks checks during a push
...
This significantly improves performance when a user pushes many references.
project.path_locks.any? doesn't cache the output and runs `SELECT 1 AS one
FROM "path_locks" WHERE project_id = N` each time. When there are thousands
of refs being pushed, this can time out the unicorn worker.
CE port for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6159 .
2018-06-18 16:42:20 -07:00
6a684432ee
Correct CE-EE parity in two CI-related specs
2018-06-18 15:22:04 -05:00
557f4e6a43
CE-EE parity to spec/lib/gitlab/ci/config_spec.rb
2018-06-18 14:25:28 -05:00
9c48089190
CE-EE parity to spec/lib/gitlab/ci/yaml_processor_spec.rb
2018-06-18 14:22:38 -05:00
5679beb228
CE-EE parity for spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
2018-06-18 14:21:37 -05:00
52dea971e9
Merge branch 'bvl-i18n-validation' into 'master'
...
Updates to `.po` & `.pot` linting
Closes #46096 et #39292
See merge request gitlab-org/gitlab-ce!18779
2018-06-18 17:10:26 +00:00
ac66547370
add spec replicating both label and milestone duplicated title issues
2018-06-18 15:17:03 +02:00
f5e4adc9bf
add spec replicating both label and milestone duplicated title issues
2018-06-18 15:14:20 +02:00
2a82179e10
Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'
...
Expose a clean_backtrace method from Gitlab::Profiler
See merge request gitlab-org/gitlab-ce!19894
2018-06-18 09:02:42 +00:00
14000a561b
Make Gitaly wiki RPC's mandatory
2018-06-18 08:19:11 +00:00
20adfb5369
Fix nil formats test
...
One of the spec files sets `nil` value for env varialbe
`action_dispatch.request.formats`. Rather than setting `nil` value,
we can delete the `action_dispatch.request.formats` key from `env`
(which should be closer to real use case anyway). The reason is that
in Rails 5, `formats` method does not set default array of formats
if the env key is already set (even if set to `nil`).
2018-06-16 21:20:58 +02:00
17fc178cb5
Correctly translate all forms in tests
2018-06-15 14:58:47 +02:00
3b5ce6945d
Validate PO-variable usage in message ids
...
That way we can detect incorrect usage before the strings are added to
Crowdin for translation
2018-06-15 14:58:46 +02:00
ca065e493e
Forbids combining named and unnamed variables in `gitlab.pot`
...
This would break with an argument error when interpolating using
`sprintf` in ruby.
2018-06-15 14:58:46 +02:00
d304f88352
Expose a clean_backtrace method from Gitlab::Profiler
...
This method makes it easier for other parts of the app to get clean backtraces,
as well as console users.
2018-06-15 13:29:55 +01:00
5fc3b8a08d
Remove FaviconUploader favicon_main version
...
See https://gitlab.com/gitlab-org/gitlab-ce/issues/47677 for more information
2018-06-15 12:28:23 +02:00
17335a42ae
Merge branch 'rails5-database' into 'master'
...
Fix table_exists? to be Rails5 compatible
Closes #45107
See merge request gitlab-org/gitlab-ce!19418
2018-06-14 13:12:37 +00:00
beba4a1d1c
Merge branch 'zj-mandatory-batch' into 'master'
...
Move Gitaly RPCs to mandatory
Closes gitaly#217, gitaly#389, gitaly#390, gitaly#220, gitaly#376, and gitaly#354
See merge request gitlab-org/gitlab-ce!19759
2018-06-14 12:16:05 +00:00
5cf5680f9c
Deny repository disk access in development and test
2018-06-14 11:18:25 +00:00
3ed4a1b3aa
HasLocalBranches check is done by Gitaly only
...
Closes https://gitlab.com/gitlab-org/gitaly/issues/217
2018-06-14 10:31:24 +02:00
89ab32c6b2
Branches are fully migrated to Gitaly
...
Closes: https://gitlab.com/gitlab-org/gitaly/issues/389
2018-06-14 10:25:28 +02:00
4fc4600747
Default branch detection happens through Gitaly
...
Migration: https://gitlab.com/gitlab-org/gitaly/issues/220
2018-06-14 09:56:16 +02:00
fa36101a7f
Use data_source_exists? instead of table_exists?
...
Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible
2018-06-14 08:39:43 +02:00
2f40fb456b
Add support for verifying remote uploads, artifacts, and LFS objects in check rake tasks
2018-06-13 17:11:43 +00:00
f195a7436d
RawBlame only called through Gitaly
...
Closes https://gitlab.com/gitlab-org/gitaly/issues/376
2018-06-13 16:44:59 +02:00
e4a9b0771a
ListCommitByOid isn't called with an empty batch
...
Batching commits for performance improvements, might lead to empty
batches being used. This isn't the case yet, but to guard against this
in future cases, a guard clause is added.
2018-06-13 15:23:34 +02:00
1721bbcb01
Resolve "Quick actions are case sensitive"
2018-06-13 10:23:57 +00:00
379a6a709a
Sidebar Milestone - Fix wrong URL when selecting a parent group milestone
2018-06-12 17:22:12 -06:00
893c824ed3
Merge branch 'pr-importer-io-extra-error-handling' into 'master'
...
Ensure MR diffs always exist in the PR importer
Closes #47312
See merge request gitlab-org/gitlab-ce!19704
2018-06-12 14:08:51 +00:00
8b0d2283d7
Merge branch 'gitaly-disk-access-3' into 'master'
...
Find and mark more Git disk access locations, part 2
See merge request gitlab-org/gitlab-ce!19437
2018-06-12 13:32:46 +00:00
f376347f24
Find and mark more Git disk access locations, part 2
2018-06-12 14:33:37 +02:00
ab93f7cc79
Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
2018-06-12 12:31:10 +00:00
e4612df0e2
Ensure MR diffs always exist in the PR importer
...
In rare cases it could happen that an MR was created, but creating the
MR diffs somehow failed (e.g. due to an error). This commit adds an
additional check to make sure MR diffs are always present when importing
GitHub pull requests.
2018-06-12 13:30:41 +02:00
450b9f6e30
Merge branch 'da-port-cte-to-ce' into 'master'
...
Add Gitlab::SQL:CTE for easily building CTE statements
See merge request gitlab-org/gitlab-ce!19652
2018-06-12 10:46:31 +00:00
421957cf8c
Merge branch 'sh-expire-content-cache-after-import' into 'master'
...
Expire Wiki content cache after importing a repository
Closes #47546
See merge request gitlab-org/gitlab-ce!19617
2018-06-11 17:35:39 +00:00
fe8261fdb2
Add Gitlab::SQL:CTE for easily building CTE statements
2018-06-11 12:44:08 -03:00
6defeb0a7d
Expire Wiki content cache after importing a repository
...
The cache state for Wikis that were imported via GitHub or Bitbucket does
not appear to have been flushed after a successful import.
Closes #47546
2018-06-11 08:33:06 -07:00
75797ac3d2
Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'
...
Resolve "Uploads specs are failing on master"
Closes #47684
See merge request gitlab-org/gitlab-ce!19638
2018-06-11 15:01:45 +00:00
1418afc2d6
Avoid checking the user format in every url validation
2018-06-11 13:29:37 +00:00
0f90c1fd73
Don't use Rails.root.join for upload fixture paths
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-06-11 13:54:25 +02:00
ea8dc10772
Don't use Gitlab::Utils.nlbr in Gitlab::Git
2018-06-11 10:42:09 +00:00
7d3bbeeb31
Merge branch 'rs-update-rspec' into 'master'
...
Update rspec to 3.7
See merge request gitlab-org/gitlab-ce!19449
2018-06-11 09:59:25 +00:00
68cb1c2651
Revert rename allow collaboration column
2018-06-08 13:12:51 +00:00
b780efab26
Merge remote-tracking branch 'origin/master' into 38542-application-control-panel-in-settings-page
2018-06-07 20:27:30 +02:00
290ca339ad
Merge branch 'feature/customizable-favicon' into 'master'
...
Customizable favicon
Closes #15661
See merge request gitlab-org/gitlab-ce!14497
2018-06-07 16:54:41 +00:00
7b562c9727
Merge branch 'sh-fix-schema-migrations-seq-scans' into 'master'
...
Avoid sequential scans loading schema_migrations table when loading application settings
See merge request gitlab-org/gitlab-ce!19541
2018-06-07 16:53:56 +00:00
36c3376475
Resolve "Hashed Storage: Make possible to migrate single project"
2018-06-07 15:40:44 +00:00
6afe6fa6bc
Make Gitlab::CurrentSettings.current_application_settings return cached settings early if they exist without issuing any DB query
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-06-07 17:23:49 +02:00
9f76632d80
Add installation type to usage ping data
2018-06-07 15:01:20 +00:00
6d165c740c
Make all uses of `fixture_file_upload` use relative paths
2018-06-07 09:54:41 -05:00
93c7976ae2
Restore navigation theme order
2018-06-07 12:24:57 +00:00
543459794a
Merge branch 'fj-move-rev-list-option' into 'master'
...
Moving rev-list lfs options to LfsChanges
See merge request gitlab-org/gitlab-ce!19497
2018-06-07 08:18:50 +00:00
164dbc6b77
Resolve "Introduce new navigation themes in GitLab 11.0"
2018-06-07 07:37:02 +00:00
86d39016a2
Moving rev-list lfs options to Lfschanges
2018-06-06 21:55:32 +02:00
9efb1875b7
Merge branch 'master' into 38542-application-control-panel-in-settings-page
2018-06-06 21:29:12 +02:00
e8f49b4bee
Support LFS objects when creating a project by import
2018-06-06 16:42:18 +00:00
e9ad837cf0
Merge branch '42751-rename-master-to-maintainer' into 'master'
...
Resolve "Rename the `Master` role to `Maintainer`"
Closes #42751
See merge request gitlab-org/gitlab-ce!19080
2018-06-06 15:00:24 +00:00
96747556e7
Merge branch 'live-trace-v2-persist-data' into 'master'
...
Live trace: Rescue stale live trace
See merge request gitlab-org/gitlab-ce!18680
2018-06-06 12:45:41 +00:00
a6c15c5b97
change wording
2018-06-06 21:01:44 +09:00
4083ea1c74
Merge branch 'rails5-fix-47376' into 'master'
...
Rails 5 fix glob spec
Closes #47376
See merge request gitlab-org/gitlab-ce!19469
2018-06-06 11:10:22 +00:00
45444c8e30
Merge branch '47189-github_import_visibility' into 'master'
...
Use Github repo visibility during import while respecting restricted visibility levels
Closes #47189
See merge request gitlab-org/gitlab-ce!19450
2018-06-06 10:54:43 +00:00
af9cc234f2
Merge branch 'bvl-graphql-start-34754' into 'master'
...
GraphQL setup: Basic Project and Merge request endpoint
Closes #34754
See merge request gitlab-org/gitlab-ce!19008
2018-06-06 10:03:34 +00:00
c5e44dc5d1
Use Github repo visibility during import while respecting restricted visibility levels
2018-06-06 12:00:15 +02:00
32f825c648
Add tests for each new code
2018-06-06 17:49:48 +09:00
2d1faddbcb
Rails 5 fix glob spec
2018-06-06 08:50:11 +02:00
a34666e655
Merge branch 'sh-reject-non-utf8-gpg' into 'master'
...
Reject GPG keys that have e-mail or names with non-valid UTF-8 encodings
Closes #47280
See merge request gitlab-org/gitlab-ce!19455
2018-06-05 22:07:35 +00:00
36a8f1a677
Reject GPG keys that have e-mail or names with non-valid UTF-8 encodings
...
These were causing 500 Errors when accessing GPG keys for some users.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47280
2018-06-05 14:39:44 -07:00
65dbead796
Fix repository archive generation when hashed storage is enabled
2018-06-05 20:44:07 +01:00
9c6c17cbcd
Add a minimal GraphQL API
2018-06-05 20:47:42 +02:00
ced0b4453e
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
...
# Conflicts:
# db/schema.rb
2018-06-05 16:46:43 +00:00
a0808df0b6
Find and mark more Git disk access locations
2018-06-05 15:51:14 +00:00
6ced2f1243
Merge branch '42751-rename-mr-maintainer-push' into 'master'
...
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
2018-06-05 15:04:18 +00:00
949c30d42b
remove all .ico favicon variations, use png always
...
the ci status icons are generated client side, wo we don't need the
static files anymore.
2018-06-05 16:20:22 +02:00
9e14f437b6
create favicon overlay on the client
...
the initial reason for this change was that graphicsmagick does not
support writing to ico files. this fact lead to a chain of changes:
1. use png instead of ico (browser support is good enough)
2. render the overlays on the client using the canvas API. this way we
only need to store the original favion and generate the overlay versions
dynamically.
this change also enables (next step) to simplify the handling of the
stock favicons as well, as we don't need to generate all the versions
upfront.
2018-06-05 16:20:21 +02:00
67fe0a17d8
call Gitlab::Favicon.status in serializer
...
this ways we can keep the `lib/gitlab/ci/status/*` classes to return the
bare favicon name as it was before.
also the favicon uploader versions are now have the same names as the
stock favicons (+ `favicon_` prefix), which makes working with the
status names easier.
2018-06-05 16:20:21 +02:00
40ffa8401b
add request store caching to favicon
2018-06-05 16:20:21 +02:00
822023c64c
Add a '?' to the custom favicon's urls
...
Without the '?' at the end of the favicon url the custom favicon (i.e.
the favicons that are served through `UploadController`) are not shown
in the browser. It may have something to do with how `#send_file` /
`#send_data` set http headers. When serving the same icon file from the
public directory everything is fine.
2018-06-05 16:20:20 +02:00
44d7b15833
use custom favicon for ci build status favicons
2018-06-05 16:20:19 +02:00
a6f3f6b8cd
extract favicon logic to lib class
2018-06-05 16:20:19 +02:00
da246582db
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
...
# Conflicts:
# db/schema.rb
2018-06-05 13:51:31 +00:00
3a4ecfd0c9
Prevent Gitaly WriteConfig log noise
2018-06-05 12:55:41 +00:00
40dc82f862
Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'
...
Add background migrations to archive legacy job traces
Closes #46642
See merge request gitlab-org/gitlab-ce!19194
2018-06-05 12:35:21 +00:00
049519e718
Merge branch 'override-consider-extend' into 'master'
...
Also verify if extending would override a class method
See merge request gitlab-org/gitlab-ce!19377
2018-06-05 12:11:58 +00:00
9ca8d88b07
Merge branch 'gh-importer-transactions' into 'master'
...
Perform pull request IO work outside a transaction
See merge request gitlab-org/gitlab-ce!19372
2018-06-05 11:11:36 +00:00
809a50fcbf
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
...
Conflicts:
app/models/ci/pipeline.rb
2018-06-05 07:39:59 +00:00
f71fc9328c
Also verify if extending would override a class method
...
Since extending a class means including on the singleton class of the
class, this should now complain this:
``` ruby
module M
extend Gitlab::Utils::Override
override :f
def f
super.succ
end
end
class C
extend M
def self.f
0
end
end
```
It should complain because `C.f` wasn't calling `M#f`.
This should pass verification:
``` ruby
module M
extend Gitlab::Utils::Override
override :f
def f
super.succ
end
end
class B
def self.f
0
end
end
class C < B
extend M
end
```
Because `C.f` would now call `M#f`, and `M#f` does override something.
2018-06-05 13:40:52 +08:00
f46739191a
Adjust insufficient diff hunks being persisted on NoteDiffFile
...
This currently causes 500's errors when loading the MR page
(Discussion) in a few scenarios.
We were not considering detailed diff headers such as
"--- a/doc/update/mysql_to_postgresql.md\n+++ b/doc/update/mysql_to_postgresql.md"
to crop the diff. In order to address it, we're now using
Gitlab::Diff::Parser, clean the diffs and builds Gitlab::Diff::Line objects
we can iterate and filter on.
2018-06-05 01:02:30 -03:00
71ed7987d3
Perform pull request IO work outside a transaction
...
When importing a GitHub pull request we would perform all work in a
single database transaction. This is less than ideal, because we perform
various slow Git operations when creating a merge request. This in turn
can lead to many DB connections being used, while just waiting for an IO
operation to complete.
To work around this, we now move most of the heavy lifting out of the
database transaction. Some extra error handling is added to ensure we
can resume importing a partially imported pull request, instead of just
throwing an error.
This commit also changes the specs for IssueImporter so they don't rely
on deprecated RSpec methods.
2018-06-04 18:33:56 +02:00
7350eb1fa8
Add ability to search wiki titles
2018-06-04 11:41:37 +00:00
8c7bffa437
Merge branch 'sh-fix-issue-43981' into 'master'
...
Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rb
Closes #43981
See merge request gitlab-org/gitlab-ce!19338
2018-06-04 08:45:40 +00:00
8f1f73d4e3
Fix typo in spec. Add a test for the case of when trace is stored in database
2018-06-04 14:28:21 +09:00
bcd664f53a
Fix specs. Rename migration file name which was conflicted with background migration's.
2018-06-04 14:14:20 +09:00
0d00d02e84
Directly refer application code from migration code
2018-06-04 14:14:20 +09:00
89b4304f12
Add background migrations to arhive legacy traces
2018-06-04 14:14:20 +09:00
eb05d475b7
Fix wording in spec. Add PIPELINE_IID in examples of debugged variables in documants.
2018-06-04 12:12:02 +09:00
d65cdd4416
Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rb
...
There was a race condition in the spec where if the commit is created on disk
within a second of the frozen `Timecop` time, the test fails.
Closes #43981
2018-06-02 15:10:35 -07:00
5403a4a07e
Add deploy_strategy to safe model attributes
2018-06-02 11:46:55 +02:00
e8ecae7e0b
Reveert build_relations and simply add a line for creating iid
2018-06-02 11:55:42 +09:00
b02b2602c1
Merge branch 'master' into per-project-pipeline-iid
2018-06-02 11:15:53 +09:00
edb9db37ed
Add "deny disk access" Gitaly feature (tripswitch)
2018-06-01 11:56:29 +00:00
840f80d48b
Add validation to webhook and service URLs to ensure they are not blocked because of SSRF
2018-06-01 11:43:53 +00:00
c89e57842e
Use shared examples for populate spec
2018-06-01 15:46:15 +09:00
c418d68765
Remove unneccesary spec
2018-06-01 15:41:33 +09:00
f7f60ab54a
Add spec for variables expressions with pipeline iid
2018-06-01 14:53:00 +09:00
4beeb60255
Fix populate_spec
2018-06-01 14:36:52 +09:00
0d44f4d50e
Rephrase "maintainer" to more precise "members who can merge to the target branch"
...
"Maintainer" will be freed to be used for #42751
2018-06-01 14:33:12 +09:00
272b8dca80
Merge branch 'master' into per-project-pipeline-iid
2018-06-01 14:32:40 +09:00
68ef6ae2da
Merge branch '41587-osw-mr-metrics-migration-take-two' into 'master'
...
Take two for MR metrics population background migration
See merge request gitlab-org/gitlab-ce!19097
2018-05-31 15:08:50 +00:00
20dfe25c15
Export assigned issues in iCalendar feed
2018-05-31 14:01:04 +00:00
711ba61a78
Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master'
...
Fix encoding bug in Gitaly::Commit::TreeEntry
Closes #46445 and gitaly#1208
See merge request gitlab-org/gitlab-ce!19243
2018-05-31 09:55:05 +00:00
4d3f7ae1ef
Removed API endpoint and specs
2018-05-30 18:23:07 +02:00
0db994fedc
Fix encoding error in Gitaly::Commit::TreeEntry
2018-05-30 17:33:17 +02:00
54ad5fb8a2
Take two for MR metrics population background migration
2018-05-30 11:51:29 -03:00
62d96d8854
Merge branch 'fix/bitbucket_import_anonymous' into 'master'
...
Import bitbucket issues that are reported by an anonymous user
Closes #44381
See merge request gitlab-org/gitlab-ce!18199
2018-05-30 09:52:58 +00:00
0e22b50df8
Add spec for variables expression
2018-05-30 16:42:55 +09:00
fd79df64c5
Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'
...
Resolve "Squash and merge in GitLab Core (CE)"
Closes #34591
See merge request gitlab-org/gitlab-ce!18956
2018-05-30 07:38:31 +00:00
09122f93c3
Merge branch 'master' into per-project-pipeline-iid
2018-05-30 14:50:09 +09:00
4aae86f6f7
Merge remote-tracking branch 'dev/master'
2018-05-29 13:51:31 -05:00
0033e57269
Merge branch 'security-fj-import-export-assignment' into 'master'
...
[master] Arbitrary assignment of Project fields using "Import project" from a Gitlab tar.gz
Closes #2678
See merge request gitlab/gitlabhq!2378
2018-05-29 18:43:04 +00:00
a2f6aa96a9
Merge branch 'master' into backstage/gb/use-persisted-stages-to-improve-pipelines-table
...
* master: (583 commits)
2018-05-29 17:24:50 +02:00
4cff66a6c4
Add 'squash and rebase' feature to CE
2018-05-29 20:51:43 +11:00
16e04e006c
Log queue duration for Grape API calls
...
This mimics the same thing the RailsQueueDuration does for Rails controller
requests and will help diagnose issues with API delays.
Closes #46601
2018-05-28 13:56:42 -07:00
1d20679e9c
Merge branch 'master' into per-project-pipeline-iid
2018-05-28 20:01:56 +09:00
265b1fafe6
Merge branch 'sh-fix-admin-page-counts-take-2' into 'master'
...
Fix fast admin counters not working when PostgreSQL has secondaries
Closes #46742
See merge request gitlab-org/gitlab-ce!19154
2018-05-28 10:36:26 +00:00
a45b9fc96c
Merge branch 'bvl-add-username-to-terms-message' into 'master'
...
Add username to terms message in git and API calls
Closes #46649
See merge request gitlab-org/gitlab-ce!19126
2018-05-28 09:53:58 +00:00
b6125f7045
Fix fast admin counters not working when PostgreSQL has secondaries
...
This commit does a number of things:
1. Reduces the number of queries needed by perform a single query to get all
the tuples for the relevant rows.
2. Uses a transaction to query the tuple counts to ensure that the data
is retrieved from the primary.
Closes #46742
2018-05-25 22:58:43 -07:00
1af2274b41
Restore lazy loading of pipeline commits in preloader
2018-05-25 13:45:08 +02:00
bb8f2520b4
Persist truncated note diffs on a new table
...
We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response.
With this change we solve this problem and simplify a lot fetching this piece of info.
2018-05-24 15:34:43 -03:00
7a139c1602
Add username to terms message in git and API calls
...
This will make it clearer to users which account is being used to make
the API/git call. So they know which account needs to be used to
accept the terms.
Closes #46649
2018-05-24 18:19:48 +02:00
4bfd54f3d2
Import bitbucket issues that are reported by an anonymous user
...
For these kind of issues, the "reporter" field is present but zero.
In such a case, "fetch" will not return the default value, but it will
return nil.
Hence, importing fails, because the "username" field of nil is referenced
Fixes issue #44381
2018-05-24 13:28:58 +02:00
2bdf6edefa
Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-23 16:14:43 +02:00
dab3ae39a2
Do not paginate pipelines active relation twice
2018-05-23 13:29:21 +02:00
3f7b9244dc
Merge branch 'issue-25256' into 'master'
...
skip email trim when email is creating new issue
See merge request gitlab-org/gitlab-ce!18865
2018-05-23 09:54:20 +00:00
40dd12c775
Resolve "Deprecate Gemnasium project service"
2018-05-23 09:40:45 +00:00
f89f232d19
Simplify pipelines preloader implementation
2018-05-23 10:22:28 +02:00
421dbb1746
skip email trim when email is creating new issue
...
Updates from MR discussion
1. Added test for ReplyParser
2. Changed param to trim_reply with default set as true
Removed keyword param in favor of normal options param
updates for MR discussion
Resolutions for code review comments
more code review fixes
2018-05-22 23:05:51 -05:00
e4eb330af7
Add pipeline stages factory method import/export support
2018-05-22 14:00:42 +02:00
ea35fd05bb
Refactor pipeline preloader to split reponsibilities better
2018-05-22 13:55:05 +02:00
8e92e25b62
Remvoe disable_ddl_transaction! and redandant RecordNotUnique exception rescue
2018-05-22 15:21:45 +09:00
f61666c0d7
Merge branch 'master' into per-project-pipeline-iid
2018-05-22 14:32:40 +09:00
b113330fab
Merge branch 'zj-workhorse-archive-mandatory' into 'master'
...
Move git archives downloading to Gitaly
See merge request gitlab-org/gitlab-ce!18990
2018-05-21 07:08:58 +00:00
ad9e00917f
Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into 'master'
...
Fix error when deleting an empty list of refs
Closes #45743
See merge request gitlab-org/gitlab-ce!19053
2018-05-19 05:42:16 +00:00
100c687cbc
Fix error when deleting an empty list of refs
...
Closes #45743
2018-05-18 20:47:46 -07:00
076ab2e8e0
Merge branch 'fix/handle-large-commit-tag-message' into 'master'
...
Add handling for commit/tags with big messages
See merge request gitlab-org/gitlab-ce!17892
2018-05-18 19:28:25 +00:00
019f5e2469
Add handling for commit/tags with big messages
2018-05-18 20:51:10 +02:00
c09498535c
Merge branch '5913-extract-ee-specific-lines-for-lib-gitlab-auth' into 'master'
...
[CE] Resolve "Extract EE specific files/lines for lib/gitlab/auth"
See merge request gitlab-org/gitlab-ce!19037
2018-05-18 18:08:46 +00:00
8bacfbd1cc
Merge branch 'zj-calculate-checksum-mandator' into 'master'
...
Calculating repository checksums executed by Gitaly
Closes gitaly#1105 and #46293
See merge request gitlab-org/gitlab-ce!18907
2018-05-18 15:53:35 +00:00
63831a24a6
Merge branch 'memoize-database-version' into 'master'
...
Memoize Gitlab::Database.version
See merge request gitlab-org/gitlab-ce!19021
2018-05-18 14:54:47 +00:00
d34d6a58fd
Minimize CE/EE difference in Gitlab::Auth::LDAP::User
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-18 16:30:54 +02:00
6226d19c71
Minimize CE/EE difference in Gitlab::Auth::LDAP::Config
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-18 16:30:53 +02:00
8b287679a1
Minimize CE/EE difference in Gitlab::Auth::LDAP::Access
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-18 16:30:53 +02:00
18a8eb96b3
Calculating repository checksums executed by Gitaly
...
OPT_OUT status has been removed, and alternative implementation removed.
Also checks if the repository exists before executing the checksum RPC
to guard against NotFound errors.
Closes gitlab-org/gitaly#1105
2018-05-18 16:07:29 +02:00
46d5ab68b7
Merge branch 'feature/gb/add-regexp-variables-expression' into 'master'
...
Add support for variables expression regexp syntax
Closes #43601
See merge request gitlab-org/gitlab-ce!18902
2018-05-18 12:08:12 +00:00
40663fb945
Merge branch 'ccr/regexp_anchor' into 'master'
...
Add anchor for incoming email regex, closes 44989
See merge request gitlab-org/gitlab-ce!18917
2018-05-18 11:47:33 +00:00
af9b0bfbae
Simplify untrusted regexp factory method
2018-05-18 10:14:10 +02:00
63c58a6dd0
Memoize Gitlab::Database.version
...
This removes the need for running a database query every time we want to
check the database version.
2018-05-17 21:23:42 +02:00
19428e8008
Preload pipeline data for project pipelines
...
When displaying the pipelines of a project we now preload the following
data:
1. Authors of the commits that belong to these pipelines
2. The number of warnings per pipeline, which is used by
Ci::Pipeline#has_warnings?
== Commit Authors
Previously this data was queried for every Commit separately, leading to
20 SQL queries being executed in the worst case. With an average of 3 to
5 milliseconds per SQL query this could result in 100 milliseconds being
spent in _just_ getting Commit authors.
To preload this data Commit#author now uses BatchLoader (through
Commit#lazy_author), and a separate module
Gitlab::Ci::Pipeline::Preloader is used to ensure all authors are loaded
before they are used.
== Number of warnings
This changes Ci::Pipeline#has_warnings? so it supports preloading of the
number of warnings per pipeline. This removes the need for executing a
COUNT(*) query for every pipeline just to see if it has any warnings or
not.
2018-05-17 13:53:00 +02:00
61d55b56ab
Update variables expressions statement specs
2018-05-17 12:55:19 +02:00
8b3e21b66b
Add variables expression pattern validation support
2018-05-17 12:44:46 +02:00
a1f1e08670
Add anti-corruption layer above expressions pattern matching
2018-05-17 12:35:20 +02:00
0ce63efe96
Add extended /regexp/ scheme support to untrusted regexp
2018-05-17 12:29:47 +02:00
48877dfc7e
Merge branch 'zj-workhorse-commit-patch-diff' into 'master'
...
Workhorse to send raw diff and patch for commits
Closes gitaly#1196
See merge request gitlab-org/gitlab-ce!18974
2018-05-17 08:12:33 +00:00
94b209b32c
Move git archives downloading to Gitaly
2018-05-17 09:31:50 +02:00
1c636b8080
Merge branch 'master' into per-project-pipeline-iid
2018-05-17 15:51:33 +09:00
f3d60d7e73
Merge branch 'sh-fast-admin-counts' into 'master'
...
Fix Error 500 viewing admin page due to statement timeouts
Closes #46255
See merge request gitlab-org/gitlab-ce!18982
2018-05-16 17:31:48 +00:00
e38938b332
Fix Error 500 viewing admin page due to statement timeouts
...
Uses PostgreSQL tuple estimates to provide a much faster yet approximate
count. See https://wiki.postgresql.org/wiki/Slow_Counting for more details.
We only use this fast method if the table has been analyzed or vacuumed
within the last hour.
Closes #46255
2018-05-16 08:27:48 -07:00
33af33d7cb
Fix GPM content types for Doorkeeper
...
Certain controllers (e.g. Doorkeeper::TokensController) don't expose the
method "request_format". This commit changes
Gitlab::Metrics::WebTransaction so we don't rely on this method, instead
using the underlying code this method uses.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/46412
2018-05-16 12:53:54 +02:00
dfdd881510
Workhorse to send raw diff and patch for commits
...
Prior to this change, this was done through unicorn. In theory this
could time out. Workhorse has been sending these raw patches and diffs
for a long time and is stable in doing so.
Added bonus is the fact that `Commit#to_patch` can be removed.
`Commit#to_diff` too, which closes
https://gitlab.com/gitlab-org/gitaly/issues/324
Closes https://gitlab.com/gitlab-org/gitaly/issues/1196
2018-05-16 11:52:43 +02:00
0288e2525f
Merge branch 'zj-ref-contains-sha-mandatory' into 'master'
...
Ref contains oid check done by Gitaly
Closes gitaly#884
See merge request gitlab-org/gitlab-ce!18944
2018-05-16 03:44:08 +00:00
728441a408
Merge branch 'fix-metrics-content-types' into 'master'
...
Fix setting Gitlab metrics content types
Closes gitlab-com/infrastructure#3499
See merge request gitlab-org/gitlab-ce!18975
2018-05-15 18:25:32 +00:00
bdf279b151
Merge branch '45584-add-nip-io-domain-suggestion-in-auto-devops' into 'master'
...
Resolve "Add nip.io domain suggestion in the Kubernetes cluster details view"
Closes #45584
See merge request gitlab-org/gitlab-ce!18496
2018-05-15 16:33:06 +00:00
c003337729
Fix setting Gitlab metrics content types
...
The method "content_type" on a controller does not always return the
correct content type. On the other hand, the method "request_format"
does _and_ immediately returns a Symbol (e.g. :json) instead of a
mime-type name (e.g. application/json). With these changes metrics
should again report their action names correctly.
Fixes https://gitlab.com/gitlab-com/infrastructure/issues/3499
2018-05-15 17:38:39 +02:00
f52de2f73c
Make variables expression pattern case-sensitivity explicit
2018-05-15 15:18:18 +02:00
7babc59e47
Use parameterized RSpec to improve variables expressions specs
2018-05-15 13:15:38 +02:00
65f4e7b2a1
Add support for pattern matching in variables expressions
2018-05-15 13:04:18 +02:00
475d2edf04
Reorganize exceptions in pipeline expressions module
2018-05-15 12:37:09 +02:00
91f8656c2c
Disable greedy mode when matching filename
2018-05-15 10:20:18 +00:00
bbba6d7e62
Merge branch 'master' into feature/gb/add-regexp-variables-expression
...
* master: (76 commits)
Conflicts:
lib/gitlab/untrusted_regexp.rb
2018-05-15 12:01:07 +02:00
46eeaafc25
Display help text below auto devops domain with nip.io domain name ( #45561 )
2018-05-15 10:36:57 +02:00
59ef79689e
Merge branch 'backstage/gb/backport-untrusted-regexp-ee-code' into 'master'
...
Backport EE-specific untrusted regexp implementation
See merge request gitlab-org/gitlab-ce!18938
2018-05-14 15:23:33 +00:00
7fc185ab25
Ref contains oid check done by Gitaly
...
These two endpoints are in opt-out, and no one noticed. Has been running
on .com for 4 months now and considered stable.
Closes https://gitlab.com/gitlab-org/gitaly/issues/884
2018-05-14 15:55:27 +02:00
f16f2b5994
Add pattern matching variables expression lexeme
2018-05-14 15:03:10 +02:00
ac65257c40
Raise variables statement exception if pattern is invalid
2018-05-14 14:38:08 +02:00
b784a985f2
Do not raise if variable expression can not be evaluated
2018-05-14 14:27:07 +02:00
da5c28a422
Backport EE-specific untrusted regexp implementation
2018-05-14 10:43:45 +02:00
1e76f289fb
Merge branch 'master' into per-project-pipeline-iid
2018-05-14 17:20:47 +09:00
761d890a68
Blacklisting attributes in the project import process
2018-05-14 09:28:33 +02:00
1be2ec2d04
Fix system hook not firing for blocked users when LDAP sign-in is used
...
An LDAP sign-in request results in a different request parameter than
a standard GitLab sign-in. Since Warden doesn't pass us the user that
was blocked, we first search for a `username` in the request parameters
and then look for `user.login`.
Closes #46307
2018-05-12 22:33:29 -07:00
be73838bdf
Add anchor for incoming email regex, closes 44989
2018-05-11 14:51:21 -07:00
0842ab8746
Merge branch 'bvl-restrict-api-git-for-terms' into 'master'
...
Block access to API & git when terms are enforced
Closes #45849
See merge request gitlab-org/gitlab-ce!18816
2018-05-11 14:37:14 +00:00
e0768a9bcb
Allow triggered builds git access
...
Allow builds that have been triggered by a user before terms were
enforced access to git. That way the builds can complete as usual.
2018-05-11 15:20:11 +02:00
cc7931cc9c
Remove Gitlab::RepoPath.strip_storage_path
...
This used to be executed because of the post receive worker, but this
uses Gitlab::GlRepository.parse now. So this removes dead code and
reduces the number of calls on `#legacy_storage_path`.
2018-05-11 13:57:43 +02:00
8b736c91fc
Implement variables expression untrusted pattern lexeme
2018-05-11 13:29:05 +02:00
a99e8a7592
Merge branch 'zj-validation-initializer' into 'master'
...
Remove method call to deprecated method
See merge request gitlab-org/gitlab-ce!18815
2018-05-11 08:19:30 +00:00
a74184eb5e
Fix static analysys
2018-05-11 16:52:48 +09:00
46fa3089c8
Rescue RecordNotUnique when pipeline is created with non-unique iid
2018-05-11 16:49:18 +09:00
b788863c68
Remove method call to deprecated method
...
Given the settings initializer creates Gitaly Storage Settings objects
already, the calls to path can be moved to that initializer.
2018-05-11 08:57:06 +02:00
910a7d02a8
Remove numericality as it's redandant with integer column and validates nil IID
2018-05-11 15:34:36 +09:00
f7f13f9db0
Block access to API & git when terms are enforced
...
When terms are enforced, but the user has not accepted the terms
access to the API & git is rejected with a message directing the user
to the web app to accept the terms.
2018-05-10 17:02:27 +02:00
b7e9c968c2
Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'
...
Support resetting of Prometheus metrics between test runs
Closes #39968
See merge request gitlab-org/gitlab-ce!18836
2018-05-10 12:31:36 +00:00
204af2e101
Support resetting of Prometheus metrics between test runs
...
Adding the :prometheus tag to an rspec test will clear out
memory-mapped files and reset the registry.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39968
2018-05-09 14:33:42 -07:00
5b584a0fd2
Backport some changes from gitlab-ee!5476
...
The lib/gitlab/git/repository.rb needs to have the same content between
gitlab-ce and gitlab-ee in order to have Gitaly working fine.
2018-05-09 13:20:28 -05:00
ee9d4386fd
Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into 'master'
...
Raise InvalidRepository error for non-valid git repositories
See merge request gitlab-org/gitlab-ce!18594
2018-05-08 20:56:46 +00:00
94099f2dd6
Merge branch '5480-epic-notifications-ce' into 'master'
...
Backport 5480-epic-notifications from EE
See merge request gitlab-org/gitlab-ce!18724
2018-05-07 19:55:00 +00:00
02741ca4c5
Backport 5480-epic-notifications from EE
2018-05-07 12:58:47 -06:00
17258b37c8
Raise InvalidRepository error for non-valid git repositories
2018-05-07 14:22:16 -03:00
f50d8079f0
Merge branch 'ccr/weight_1481' into 'master'
...
Backport of 1481-changing-weight-values-should-trigger-system-notes
See merge request gitlab-org/gitlab-ce!18699
2018-05-07 16:35:37 +00:00
d0cbef7e8f
Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'
...
CE backport of Backports Push Mirrors to CE
Closes #42099
See merge request gitlab-org/gitlab-ce!18715
2018-05-07 15:15:57 +00:00
713c7fa9a5
Client implementation GetRawChanges
...
Part of https://gitlab.com/gitlab-org/gitaly/issues/1138
2018-05-07 15:37:49 +02:00
92482e01b4
Bump Gitaly to 0.98.0
...
Hooks were run for wikis, but given the internal API wasn't responding
failures happended, as seen on:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18693
2018-05-07 14:10:04 +02:00
9a13059332
Backports every CE related change from ee-5484 to CE
2018-05-07 11:59:51 +02:00
1fd10d4f24
Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all
2018-05-07 12:04:30 +09:00
1f39fcd112
Merge branch 'master' into live-trace-v2
2018-05-07 11:59:43 +09:00
58aa2d7f39
Merge branch '44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui' into 'master'
...
Resolve "Specify variables when executing a manual pipeline from the UI"
Closes #44059
See merge request gitlab-org/gitlab-ce!18440
2018-05-06 16:48:00 +00:00
bddbcaefc2
Backports every CE related change from ee-44542 to CE
2018-05-04 17:33:26 +02:00
8fd76a752b
Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all
2018-05-04 20:20:07 +09:00
e1ad8ca6d0
Test trace_spec on both conditions - ci_enable_live_trace is on/off
2018-05-04 19:49:26 +09:00
c6e394bb84
Improve variable comparison
2018-05-04 12:35:36 +02:00
1019dff237
Backport of 1481-changing-weight-values-should-trigger-system-notes
2018-05-03 11:18:51 -07:00
d39b3d4b8d
Merge branch 'master' into feature/runner-per-group
2018-05-03 09:54:12 +02:00
90da0d4fe2
Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all
2018-05-03 14:21:37 +09:00
30464bceaa
Merge branch 'master' into live-trace-v2
2018-05-03 14:21:06 +09:00
fc42ba6c5d
Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
2018-05-02 15:54:06 +02:00
8b0b4ecee2
Merge branch 'backstage/gb/migrate-pipeline-stages-index' into 'master'
...
Migrate pipeline stages indices
Closes #43009
See merge request gitlab-org/gitlab-ce!18420
2018-05-02 07:28:15 +00:00
502b170927
Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all
2018-05-02 14:46:57 +09:00
65c11f3261
Merge branch 'master' into live-trace-v2
2018-05-02 14:23:47 +09:00
1134f540d2
Merge branch 'helm-add-alpine-mirrors' into 'master'
...
Add alpine mirrors while operating on k8s cluster
Closes gitlab-ee#4922
See merge request gitlab-org/gitlab-ce!18651
2018-05-01 13:08:59 +00:00
Yorick Peterse
Mayra Cabrera
James Lopez
Sean McGivern
Douwe Maan
Mario de la Ossa
Zeger-Jan van de Weg
Rémy Coutable
Stan Hu
Robert Speicher
Jacob Vosmaer (GitLab)
Jan Provaznik
Bob Van Landuyt
Sean McGivern
Douwe Maan
Jarka Kadlecová
Michael Kozono
Jan
Nick Thomas
Francisco Javier López
Douglas Barbosa Alexandre
Mark Chao
Kamil Trzciński
Gabriel Mazetto
Balasankar C
George Tsiolis
Annabel Gray
Matija Čupić
Imre Farkas
Shinya Maeda
Jasper Maes
Robert Speicher
Alexis Reigel
Alexis Reigel
Grzegorz Bizon
Lin Jen-Shin
Oswaldo Ferreira
Kim "BKC" Carlbäcker
Phil Hughes
Grzegorz Bizon
blackst0ne
Bart Libert
Olivier Gonzalez
Cameron Crockett
Sergey Sinev
Ahmad Sherif
Dylan Griffith
Chantal Rollison
Rubén Dávila
Tiago Botelho