root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
68,135 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

3696 Commits

Author SHA1 Message Date
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
Robert Speicher 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
Ahmad Sherif 1ebb781f6a Migrate Git::Repository#delete_refs to Gitaly 
Closes gitaly#967
 2018-01-30 23:48:51 +01:00
Grzegorz Bizon 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
Douwe Maan 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
Jacob Vosmaer (GitLab) 5c2fe2d3d7 Decouple more of Repository from Rugged 2018-01-30 16:21:55 +00:00
Tiago Botelho 1ab85b9696 Only new users get marked as external 2018-01-30 15:30:25 +00:00
Robert Speicher 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
Jacob Vosmaer (GitLab) e407c2d18f Don't allow Repository#log with limit zero 2018-01-29 15:27:46 +00:00
Pawel Chojnacki d4c768ce09 Rename Concern -> Methods 2018-01-29 15:13:05 +01:00
Pawel Chojnacki 2b5a639d79 use public_send where appropriate 2018-01-29 15:13:05 +01:00
Pawel Chojnacki 7772dfb788 before -> after 2018-01-29 15:13:05 +01:00
Pawel Chojnacki f51147834e use define_method to define devine_metric_method. (couldn't resist) 2018-01-29 15:13:05 +01:00
Pawel Chojnacki 67d4946347 Fix ruby sampler spec 2018-01-29 15:13:05 +01:00
Pawel Chojnacki 7d716cc849 Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is inherited. 2018-01-29 15:13:04 +01:00
Pawel Chojnacki 83ae172145 Cleanup rspec 2018-01-29 15:13:04 +01:00
Pawel Chojnacki f5383578d9 NullMetric as a singleton 2018-01-29 15:13:04 +01:00
Pawel Chojnacki 3e898be8aa Avoid cascading locking 2018-01-29 15:13:04 +01:00
Pawel Chojnacki 67fcd0610c Test if feature is respected 2018-01-29 15:13:04 +01:00
Pawel Chojnacki 5f7aa407a8 Small Concern_spec cleanup 2018-01-29 15:13:04 +01:00
Pawel Chojnacki e3fe65543b Add Tests for Metrics::Concern 2018-01-29 15:13:04 +01:00
Pawel Chojnacki 0325c23732 Fix tests 2018-01-29 15:13:03 +01:00
Pawel Chojnacki 91a991367e Convert active record 2018-01-29 15:13:03 +01:00
Pawel Chojnacki 66c1acba0b Fix code after refactoring 2018-01-29 15:13:03 +01:00
Pawel Chojnacki d97548daa8 cleanup method call 2018-01-29 15:13:03 +01:00
James Lopez 3b7575de10
fix spec 2018-01-26 15:26:27 +01:00
James Lopez 85d47384de
add an extra spec 2018-01-26 15:26:26 +01:00
James Lopez 482fc5537f
fix validation error on services 2018-01-26 15:26:25 +01:00
Lin Jen-Shin a2618310ae Use Process::Status rather than an integer 
However keep backward compatibility
 2018-01-26 19:42:48 +08:00
Lin Jen-Shin 54ca8d0d6c Fail static-analysis if there's output to stderr 
TODO: fix offenders
 2018-01-26 19:42:48 +08:00
Ahmad Sherif 2290b438f4 Fix rubocop offenses introduced in !16623 2018-01-25 20:44:16 +01:00
Robert Speicher af95ba2fb4 Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master' 
Migrate restoring repo from bundle to Gitaly

Closes gitaly#946

See merge request gitlab-org/gitlab-ce!16623
 2018-01-25 19:03:51 +00:00
Rémy Coutable 26c4dea7ad Merge branch 'lint-rugged' into 'master' 
Add a lint check to restrict use of Rugged

See merge request gitlab-org/gitlab-ce!16656
 2018-01-25 17:52:01 +00:00
Grzegorz Bizon 9df130ff22 Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master' 
Fix .batch_lfs_pointers accepting a lazy enumerator

See merge request gitlab-org/gitlab-ce!16701
 2018-01-25 14:28:48 +00:00
Ahmad Sherif 07b0beb004 Fix .batch_lfs_pointers accepting a lazy enumerator 2018-01-25 14:11:27 +01:00
Jacob Vosmaer 6d6f7536bd Look for rugged with static analysis 2018-01-25 14:05:11 +01:00
Douwe Maan eab9ffeff6 Merge branch 'revert-430b3f0e' into 'master' 
Revert "Merge branch 'remove-rugged-walk' into 'master'"

See merge request gitlab-org/gitlab-ce!16676
 2018-01-25 11:15:07 +00:00
Rémy Coutable d2bf53942f Merge branch 'jej/gitattributes-check-at-ref' into 'master' 
Can parse root .gitattributes file for a ref

See merge request gitlab-org/gitlab-ce!16418
 2018-01-25 11:01:36 +00:00
Jacob Vosmaer (GitLab) 7363aa0b9d Revert "Merge branch 'remove-rugged-walk' into 'master'" 
This reverts merge request !16525
 2018-01-25 11:03:29 +01:00
Rémy Coutable 567b3826a9 Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' 
Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT"

Closes #42161

See merge request gitlab-org/gitlab-ce!16637
 2018-01-25 09:16:18 +00:00
Stan Hu 8671261309 Add a gRPC health check to ensure Gitaly is up 
This will enable Geo to skip shards that not operational.

Relates to gitlab-org/gitlab-ee#4329
 2018-01-24 15:47:27 -08:00
Yorick Peterse a349a4269c Merge branch 'search-100' into 'master' 
Use limit for search count queries

See merge request gitlab-org/gitlab-ce!16502
 2018-01-24 20:21:40 +00:00
Robert Speicher f35bac576d Merge branch '40744-idempotent-ids' into 'master' 
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'

Closes #30783

See merge request gitlab-org/gitlab-ce!16516
 2018-01-24 19:29:57 +00:00
Ahmad Sherif 29fa930baf Migrate .batch_lfs_pointers to Gitaly 
Closes gitaly#921
 2018-01-24 19:02:51 +01:00
Ahmad Sherif 6a28967c14 Migrate restoring repo from bundle to Gitaly 
Closes gitaly#946
 2018-01-24 19:02:32 +01:00
Nick Thomas 93ea3234df
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' 2018-01-24 17:25:55 +00:00
Ahmad Sherif 24625323a8 Migrate repository bundling to Gitaly 
Closes gitaly#929
 2018-01-24 12:10:31 +01:00
James Edwards-Jones 0683d31ab1 Can parse root .gitattributes file for a ref 2018-01-24 05:15:37 +00:00
Jan Provaznik 090ca9c33e Use limit for search count queries 
Search query is especially slow if a user searches a generic string
which matches many records, in such case search can take tens of
seconds or time out. To speed up the search query, we search only for
first 1000 records, if there is >1000 matching records we just display
"1000+" instead of precise total count supposing that with such amount
the exact count is not so important for the user.

Because for issues even limited search was not fast enough, 2-phase
approach is used for issues: first we use simpler/faster query to get
all public issues, if this exceeds the limit, we just return the limit.
If the amount of matching results is lower than limit, we re-run more
complex search query (which includes also confidential issues).
Re-running the complex query should be fast enough in such case because the
amount of matching issues is lower than limit.

Because exact total_count is now limited, this patch also switches to
to "prev/next" pagination.

Related #40540
 2018-01-23 22:33:42 +01:00
Rémy Coutable d8eb961d0b
Fix a migration spec messing up the MergeRequestDiff DB schema 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-01-23 17:42:37 +01:00