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
50,958 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

2036 Commits

Author SHA1 Message Date
Douwe Maan 185fd98fd4 Merge branch 'fix-gitaly-not-found' into 'master' 
Re-enable ref operations with gitaly after not-found fix

See merge request !10773
 2017-05-02 22:32:34 +00:00
Douwe Maan 2a73f0a638 Merge branch 'rs-described_class-cop-2' into 'master' 
Enable `RSpec/DescribedClass` cop and correct violations

See merge request !10930
 2017-05-02 22:30:30 +00:00
Alejandro Rodríguez 5e0e5801f1 Re-enable ref operations with gitaly after not-found fix 2017-05-02 17:17:58 -03:00
Douwe Maan fa0c944ede Merge branch '30272-bvl-reject-more-namespaces' into 'master' 
Reject more reserved paths

Closes #30272

See merge request !10413
 2017-05-02 17:42:23 +00:00
Sean McGivern 780dcf9cdb Merge branch 'gitaly-branch-tag-count' into 'master' 
Use Gitaly for getting Branch/Tag counts

Closes gitaly#157

See merge request !10780
 2017-05-02 13:17:51 +00:00
Bob Van Landuyt c853dd6158 Reuse Gitlab::Regex.full_namespace_regex in the DynamicPathValidator 2017-05-02 09:13:41 +02:00
Douwe Maan 3d318f3c92 Merge branch 'fix/add-specs-for-request-profiler' into 'master' 
Add specs for Gitlab::RequestProfiler

Closes #31513

See merge request !11005
 2017-05-01 16:58:19 +00:00
Douwe Maan 45f3b0b779 Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' 
Don't blow up when email has no References header

Closes gitlab-ee#2247

See merge request !11014
 2017-05-01 16:11:11 +00:00
Ahmad Sherif 13de8aeec8 Add specs for Gitlab::RequestProfiler 
Closes #31513
 2017-05-01 17:32:45 +02:00
Douwe Maan 623eb34f1a Merge branch '28968-revert-allow-people-with-merge-access-to-create-branches' into 'master' 
Prevent people from creating branches if they don't have persmission to push

Closes #28968

See merge request !10983
 2017-05-01 15:14:31 +00:00
Robert Speicher d49768296c Auto-correct `RSpec/DescribedClass` violations 2017-05-01 11:13:33 -04:00
Sean McGivern 08b1380ff7 Don't blow up when email has no References header 
If an email doesn't match our incoming email patterns on the To header, we fall
back to the References header. If there was no References header, we'd raise an
exception, when we'd be better off acting as if it was empty.
 2017-05-01 14:25:04 +01:00
Bob Van Landuyt 2e2a63c866 Rename child namespaces in migrationhelpers 2017-05-01 11:14:24 +02:00
Bob Van Landuyt b85f2fa4c7 Clear html cache for a projects milestones 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 99a03fd6e9 Move ReservedPathsMigration into V1 namespace 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 39efd0c030 Clear cached markdown after renaming projects 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 389057f001 Rename Projects & Namespaces based on entire paths 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 27f54bebb2 Use objects for renaming namespaces and projects 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 0369ef1452 Add a WIP spec for clearing the cache 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 579d8891d5 Rename projects in a migrationhelper 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 7508ee5667 Make renaming records in the database reusable 
So we can use it for projects
 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 58bc628d30 Rename namespace-paths in a migration helper 2017-05-01 11:14:24 +02:00
Bob Van Landuyt 2f95e6a0c4 Move `replace_sql` into `Database::MigrationHelpers` 2017-05-01 11:14:24 +02:00
Robert Speicher 2952a44779 Merge branch 'enable-spec-file-name-cop' into 'master' 
Enable RSpec/FilePath cop

Closes #31316

See merge request !10911
 2017-04-28 18:02:17 +00:00
Pawel Chojnacki 19edeba8e3 Prevent people from creating branches if they don't have persmission to push 2017-04-28 16:05:00 +02:00
Kim "BKC" Carlbäcker a998710a3b Fix RSpec 2017-04-28 13:07:54 +02:00
Douwe Maan b9eb846b92 Merge branch 'remove-invalid-services' into 'master' 
Remove invalid services with nil or empty type

See merge request !10847
 2017-04-27 16:10:49 +00:00
Douwe Maan 4d4aefc561 Merge branch '30973-fix-network-graph-ordering' into 'master' 
Fix ordering of commits in the network graph.

Closes #30973

See merge request !10936
 2017-04-27 15:55:05 +00:00
Tiago Botelho 972440b15d tadds migration to remove invalid services 2017-04-27 15:59:25 +01:00
Timothy Andrew a7e67604b3 Fix ordering of commits in the network graph. 
- We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1

- Prior to this upgrade, the default sort order for commits returned by
  `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the
  graph relied on.

- While upgrading `rugged`, the MR also changed this default to
  `Rugged::SORT_NONE`, which broke commit ordering in the graph.

- This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort
  by date, and changes the graph builder `Network::Graph` so it explictly
  requests the `:date` sort order
 2017-04-27 13:09:54 +00:00
Toon Claes ed6ed251af Remove unused optional parameter `asciidoc_opts` 2017-04-27 13:22:17 +02:00
Toon Claes a53442751f Fix failing specs 2017-04-27 13:22:17 +02:00
Bob Van Landuyt 019b06b9d2 Load a project's CI status in batch from redis 2017-04-26 12:04:22 +00:00
Sean McGivern 5069682d8e Enable RSpec/FilePath cop 
- Ignore JS fixtures
- Ignore qa directory
- Rewrite concern specs to put concern name first
 2017-04-26 12:50:32 +01:00
Sean McGivern 3ff8d8020e Merge branch '20378-natural-sort-issue-numbers' into 'master' 
Change issues sentence to use natural sorting

Closes #20378

See merge request !7110
 2017-04-26 09:40:12 +00:00
Rémy Coutable fa01c37359 Ensures that OAuth/LDAP/SAML users don't need to be confirmed 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-26 10:08:44 +02:00
Jeff Stubler a78eeefd6e Change issues sentence to use natural sorting 2017-04-25 18:57:08 -05:00
Douwe Maan d7e2ac7293 Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled 2017-04-24 19:27:39 -07:00
Sean McGivern ce559142a6 Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' 
Fix commenting on an existing discussion on an unchanged line that is no longer in the diff

Closes #31339

See merge request !10888
 2017-04-24 17:28:39 +00:00
Rémy Coutable df65e4376e Merge branch '30305-oauth-token-push-code' into 'master' 
Allow OAuth clients to push code

Closes #30305

See merge request !10677
 2017-04-24 16:31:32 +00:00
Douwe Maan 63d38a303b Fix commenting on an existing discussion on an unchanged line that is no longer in the diff 2017-04-24 11:17:15 -05:00
Dmitriy Zaporozhets 1f3b410bcf
Fix outdated specs that were not executed due to wrong filename 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2017-04-24 14:57:11 +03:00
Dmitriy Zaporozhets bc695e264c
Fix incorrect spec filenames which were ingored by CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2017-04-24 13:22:03 +03:00
James Lopez 71b6a4ba85 Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING error 2017-04-20 16:10:33 +02:00
Douwe Maan d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
Sean McGivern 40a972057d Merge branch 'usage-ping-port' into 'master' 
Usage ping port

Closes #27750

See merge request !10481
 2017-04-19 14:48:31 +00:00
Lin Jen-Shin b07da07c82 Just enforce the output encoding for Ansi2html 
Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/27545/
 2017-04-18 17:12:06 +08:00
Douwe Maan d6f49b85f1 Fix specs 2017-04-17 18:31:23 -05:00
Lin Jen-Shin 9350b9064c Set the encoding in c'tor and explain why it's fine 2017-04-17 17:52:15 +08:00
Lin Jen-Shin f05ab97e1e Restore nil for stream 2017-04-17 17:12:43 +08:00