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

7119 Commits

Author SHA1 Message Date
Robert Speicher 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
Jacob Vosmaer (GitLab) 3a4ecfd0c9 Prevent Gitaly WriteConfig log noise 2018-06-05 12:55:41 +00:00
Kamil Trzciński 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
Nick Thomas 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
Nick Thomas 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
Grzegorz Bizon 228f52b83b Merge branch 'perform-ci-build-auth-always-on-primary-ce' into 'master' 
Bring back the EE changes to CE to authentication of builds

See merge request gitlab-org/gitlab-ce!19391
 2018-06-05 08:04:55 +00:00
Lin Jen-Shin 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
Oswaldo Ferreira 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
Kamil Trzciński 1e3cea1a0f Bring back the EE changes to CE to authentication of builds 2018-06-04 22:25:46 +02:00
Yorick Peterse 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
Mark Chao 4f20bf956a Backport EE SlashCommand Refactor 2018-06-04 12:42:02 +00:00
Yorick Peterse 848ecbc7a6 Merge branch 'rails5-fix-46281' into 'master' 
Rails5 fix arel from

Closes #46281

See merge request gitlab-org/gitlab-ce!19340
 2018-06-04 11:58:56 +00:00
Francisco Javier López 7350eb1fa8 Add ability to search wiki titles 2018-06-04 11:41:37 +00:00
Shinya Maeda 2184c753fd Revise comments in ArchiveLegacyTraces 2018-06-04 14:14:20 +09:00
Shinya Maeda 0d00d02e84 Directly refer application code from migration code 2018-06-04 14:14:20 +09:00
Shinya Maeda 89b4304f12 Add background migrations to arhive legacy traces 2018-06-04 14:14:20 +09:00
Jasper Maes a91999e4fa Rails5 Fix arel from 2018-06-02 15:00:51 +02:00
Shinya Maeda e8ecae7e0b Reveert build_relations and simply add a line for creating iid 2018-06-02 11:55:42 +09:00
Shinya Maeda b02b2602c1 Merge branch 'master' into per-project-pipeline-iid 2018-06-02 11:15:53 +09:00
NLR dca702a599 Make http_io honor HTTP(S)_PROXY environment. 2018-06-01 14:32:10 +00:00
Jacob Vosmaer (GitLab) edb9db37ed Add "deny disk access" Gitaly feature (tripswitch) 2018-06-01 11:56:29 +00:00
Douwe Maan cc5890f287 Merge branch '46481-preserve-warnings-even-if-passed' into 'master' 
Resolve "A lot of constants redefinition warnings"

Closes #46481

See merge request gitlab-org/gitlab-ce!19286
 2018-06-01 11:49:39 +00:00
Francisco Javier López 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
Lin Jen-Shin 1e2b6cf514 Introduce Gitlab::Auth.omniauth_setup_providers 
Which could extend from EE
 2018-06-01 14:30:10 +08:00
Lin Jen-Shin 39b6f31c66 Eliminate constants warnings by: 
* Replace `require` or `require_relative` with `require_dependency`
* Remove unneeded `autoload`
 2018-06-01 13:46:46 +08:00
Mark Chao 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
Shinya Maeda 272b8dca80 Merge branch 'master' into per-project-pipeline-iid 2018-06-01 14:32:40 +09:00
Rémy Coutable 02f8f900da Merge branch 'rails5-active-sup-subscriber' into 'master' 
Make ActiveRecordSubscriber rails 5 compatible

Closes #44702

See merge request gitlab-org/gitlab-ce!19276
 2018-05-31 16:21:13 +00:00
Grzegorz Bizon 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
Imre Farkas 20dfe25c15 Export assigned issues in iCalendar feed 2018-05-31 14:01:04 +00:00
Jarka Kadlecová c37a9ef3c5 Make ActiveRecordSubscriber rails 5 compatible 2018-05-31 15:02:45 +02:00
Yorick Peterse d148473c97 Merge branch 'rails5-calendar' into 'master' 
Replace .having with .where in calendar query

Closes #46964

See merge request gitlab-org/gitlab-ce!19230
 2018-05-31 11:24:04 +00:00
Douwe Maan 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
Douwe Maan ee3b5923a5 Merge branch 'fj-36819-remove-v3-api' into 'master' 
Removal of API v3 from the codebase

Closes #36819

See merge request gitlab-org/gitlab-ce!18970
 2018-05-31 08:01:56 +00:00
Rémy Coutable 86550fa1be Merge branch 'dm-relative-url-root-in-development' into 'master' 
Fix various bugs related to relative_url_root in development

See merge request gitlab-org/gitlab-ce!19213
 2018-05-31 07:21:13 +00:00
Jan Provaznik 7b7b249ef4 Replace .having with .where in calendar query 
the current syntax doesn't work properly in Rails 5, the resulting query
looks like:
HAVING "events"."project_id" IN (0)

instead of:
HAVING "events"."project_id" IN (SELECT "projects"."id" FROM...

Also we should not use ActiveRecord internal methods. In this case we
can filter projects in WHERE clause instead of doing this in HAVING
clause. Usage of WHERE should be also more efficient because grouping
is then done on much smaller subset of records.
 2018-05-30 20:33:25 +02:00
Francisco Javier López 4d3f7ae1ef
Removed API endpoint and specs 2018-05-30 18:23:07 +02:00
Kim "BKC" Carlbäcker 0db994fedc Fix encoding error in Gitaly::Commit::TreeEntry 2018-05-30 17:33:17 +02:00
Oswaldo Ferreira 54ad5fb8a2 Take two for MR metrics population background migration 2018-05-30 11:51:29 -03:00
Douwe Maan 0956c86069 Merge branch 'brodock-refactor-hashed-storage-task' into 'master' 
Extracted auxiliary methods from storage.rake into specific RakeHelper

See merge request gitlab-org/gitlab-ce!18962
 2018-05-30 10:02:59 +00:00
Douwe Maan 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
Shinya Maeda 59e1e97108 Add build_relations method in Chain::Populate 2018-05-30 15:17:09 +09:00
Shinya Maeda 09122f93c3 Merge branch 'master' into per-project-pipeline-iid 2018-05-30 14:50:09 +09:00
Robert Speicher ff575b782e Merge branch '6045-extract-ee-specific-specs-lines' into 'master' 
[CE] Resolve "Extract EE specific files/lines for some controller specs"

Closes #6045

See merge request gitlab-org/gitlab-ce!19089
 2018-05-29 19:20:40 +00:00
Mayra Cabrera 4aae86f6f7 Merge remote-tracking branch 'dev/master' 2018-05-29 13:51:31 -05:00
Mayra Cabrera 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
Douwe Maan 033b44eb61
Fix various bugs related to relative_url_root in development 2018-05-29 15:03:14 +02:00
Gabriel Mazetto b384d5e544 refactor to remove duplication 2018-05-28 23:39:36 +02:00
Gabriel Mazetto 818b4d0a19 Refactor RakeHelper to reduce complexity 2018-05-28 23:39:36 +02:00
Gabriel Mazetto 78d25079f5 Extracted auxiliary methods from storage.rake into specific RakeHelper 2018-05-28 23:39:35 +02:00