e60bf2f256
Incorporate OperationService.UserSquash Gitaly RPC
2018-02-02 19:02:40 -03:00
a58f8c32c6
Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'
...
Sanitize extra blank spaces used when uploading a SSH key
Closes #40552
See merge request gitlab-org/gitlab-ce!16821
2018-02-02 19:18:12 +00:00
cd5d75c362
Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into 'master'
...
Avoid error when creating forks and restricted levels are defined
Closes #42607
See merge request gitlab-org/gitlab-ce!16881
2018-02-02 19:12:55 +00:00
eaada9d706
use Gitlab::UserSettings directly as a singleton instead of including/extending it
2018-02-02 18:39:55 +00:00
f677aa7d57
fix label issue
2018-02-02 06:35:40 -08:00
948150f050
Avoid error when no restricted levels are defined
...
When no visibility levels are defined they could sometimes return
`nil` instead of an empty array. In this case we want to allow all
levels.
2018-02-02 13:17:32 +01:00
36838a843e
Merge branch 'master' into '3867-port-to-ce'
...
# Conflicts:
# db/schema.rb
2018-02-02 11:58:32 +00:00
972f564dcd
Sanitize extra blank spaces used when uploading a SSH key
2018-02-01 17:00:16 -05:00
658749ddd3
Fix an issue where sparse checkout wasn't configured correctly
...
This was affecting the performance of `Gitlab::Git::Repository#squash`.
2018-02-01 17:07:40 -03:00
2793e3e1cc
Merge branch 'gitaly-970-repo-write-config' into 'master'
...
Migrate Gitlab::Git::Repository#write_config to Gitaly
Closes gitaly#970
See merge request gitlab-org/gitlab-ce!16730
2018-02-01 19:46:32 +00:00
e3d32e8a26
fix specs
2018-02-01 12:14:46 -05:00
2057a6acde
port of 594e6a0a625^..f74c90f68c6
2018-02-01 12:14:46 -05:00
d974ddb70e
Merge branch '36009-user-default-project-creator-in-factories' into 'master'
...
Make user/author use project.creator in most factories
Closes #36009
See merge request gitlab-org/gitlab-ce!13321
2018-02-01 16:11:56 +00:00
76b9f1a4c5
Merge branch '42497-rubocop-style-regexpliteral' into 'master'
...
Enable Style/RegexpLiteral cop
Closes #42497
See merge request gitlab-org/gitlab-ce!16752
2018-02-01 09:11:09 +00:00
283c0a9d28
Merge branch 'repository-log-disable-walk' into 'master'
...
Remove Rugged::Walk implementation of #log
See merge request gitlab-org/gitlab-ce!16798
2018-01-31 21:54:02 +00:00
a2718ebaff
Make user/author use project.creator in most factories
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-31 18:31:21 +01:00
2b6307f6ad
Enable RuboCop Style/RegexpLiteral
2018-02-01 02:06:07 +09:00
28bbb4cb47
Migrate Gitlab::Git::Repository#write_config to Gitaly
...
- Add tests for Repository#write_config
2018-01-31 15:02:31 +01:00
a0fc0fcc53
Merge branch 'rugged-reference-cache-rescue' into 'master'
...
Stop rescuing Rugged::Reference in Repository cache
See merge request gitlab-org/gitlab-ce!16770
2018-01-31 14:00:37 +00:00
afe665d9c0
Remove Rugged::Walk implementation of #log
2018-01-31 11:56:36 +01:00
e47b7a286d
Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master'
...
Migrate Git::Repository#delete_refs to Gitaly
Closes gitaly#967
See merge request gitlab-org/gitlab-ce!16723
2018-01-30 23:26:50 +00:00
1ebb781f6a
Migrate Git::Repository#delete_refs to Gitaly
...
Closes gitaly#967
2018-01-30 23:48:51 +01:00
a74413980b
Merge branch '41771-reduce-cardinality-of-metrics' into 'master'
...
Reduce the cardinality of GitLab metrics
Closes #41771
See merge request gitlab-org/gitlab-ce!16443
2018-01-30 20:58:28 +00:00
4752f629cd
Merge branch '21554-mark-new-user-as-external' into 'master'
...
Login via OAuth marked as "external" should only mark new users as "external", not existing ones
Closes #21554
See merge request gitlab-org/gitlab-ce!16672
2018-01-30 18:32:56 +00:00
a6dbb85e97
Remove Rugged exception in cache rescue
2018-01-30 17:51:56 +01:00
5c2fe2d3d7
Decouple more of Repository from Rugged
2018-01-30 16:21:55 +00:00
1ab85b9696
Only new users get marked as external
2018-01-30 15:30:25 +00:00
1f309b69df
Merge branch '41972-make-sure-no-warnings' into 'master'
...
Fail static-analysis if there's output to stderr
Closes #41972
See merge request gitlab-org/gitlab-ce!16648
2018-01-29 21:09:09 +00:00
e407c2d18f
Don't allow Repository#log with limit zero
2018-01-29 15:27:46 +00:00
d4c768ce09
Rename Concern -> Methods
2018-01-29 15:13:05 +01:00
2b5a639d79
use public_send where appropriate
2018-01-29 15:13:05 +01:00
7772dfb788
before -> after
2018-01-29 15:13:05 +01:00
f51147834e
use define_method to define devine_metric_method. (couldn't resist)
2018-01-29 15:13:05 +01:00
67d4946347
Fix ruby sampler spec
2018-01-29 15:13:05 +01:00
7d716cc849
Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is inherited.
2018-01-29 15:13:04 +01:00
83ae172145
Cleanup rspec
2018-01-29 15:13:04 +01:00
f5383578d9
NullMetric as a singleton
2018-01-29 15:13:04 +01:00
3e898be8aa
Avoid cascading locking
2018-01-29 15:13:04 +01:00
67fcd0610c
Test if feature is respected
2018-01-29 15:13:04 +01:00
5f7aa407a8
Small Concern_spec cleanup
2018-01-29 15:13:04 +01:00
e3fe65543b
Add Tests for Metrics::Concern
2018-01-29 15:13:04 +01:00
0325c23732
Fix tests
2018-01-29 15:13:03 +01:00
91a991367e
Convert active record
2018-01-29 15:13:03 +01:00
66c1acba0b
Fix code after refactoring
2018-01-29 15:13:03 +01:00
d97548daa8
cleanup method call
2018-01-29 15:13:03 +01:00
3b7575de10
fix spec
2018-01-26 15:26:27 +01:00
85d47384de
add an extra spec
2018-01-26 15:26:26 +01:00
482fc5537f
fix validation error on services
2018-01-26 15:26:25 +01:00
a2618310ae
Use Process::Status rather than an integer
...
However keep backward compatibility
2018-01-26 19:42:48 +08:00
54ca8d0d6c
Fail static-analysis if there's output to stderr
...
TODO: fix offenders
2018-01-26 19:42:48 +08:00
Alejandro Rodríguez
Douwe Maan
Mario de la Ossa
James Lopez
Bob Van Landuyt
Sean McGivern
Rubén Dávila
Robert Speicher
Micaël Bergeron
Rémy Coutable
Takuya Noguchi
Kim "BKC" Carlbäcker
Jacob Vosmaer
Ahmad Sherif
Grzegorz Bizon
Tiago Botelho
Pawel Chojnacki
Lin Jen-Shin