Commit Graph

5314 Commits

Author SHA1 Message Date
Robert Speicher 377c10b493 Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into 'master'
Migrate Workhorse Send{Diff,Patch} to Gitaly

See merge request gitlab-org/gitlab-ce!14652
2017-10-10 11:02:25 +00:00
Rémy Coutable f070265a6d
Introduce new hook data builders for Issue and MergeRequest
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-09 16:44:47 +02:00
Rémy Coutable 075d651604 Start adding Gitlab::HookData::IssuableBuilder
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-09 15:07:10 +02:00
Ahmad Sherif 618dd9e4b2 Migrate Workhorse Send{Diff,Patch} to Gitaly 2017-10-09 14:18:05 +02:00
Bob Van Landuyt 392e5df796 Don't create fork networks for root projects that are deleted 2017-10-09 08:44:23 +02:00
Stan Hu 01d7335b43 Merge branch '38890-fix-gpg-signature-updater-when-commit-is-missing' into 'master'
Fix error with GPG signature updater when commit was deleted

Closes #38890

See merge request gitlab-org/gitlab-ce!14749
2017-10-07 19:16:18 +00:00
Michael Kozono ac5784368f Sync up hard coded DN class in migration 2017-10-07 10:28:13 -07:00
Michael Kozono 2df7d03586 Redefine `respond_to?` in light of `method_missing` 2017-10-07 10:28:13 -07:00
Michael Kozono e0a0c6b04e Make internal methods private 2017-10-07 10:28:13 -07:00
Michael Kozono 8c29a04549 Leave bad DNs alone instead of raising errors 2017-10-07 10:28:13 -07:00
Michael Kozono 1d1ad7e0b6 Refactor DN error classes 2017-10-07 10:28:13 -07:00
Michael Kozono 1879980f2e Move migration to background 2017-10-07 10:28:13 -07:00
Michael Kozono 6b9229466d Normalize values, reusing DN normalization code
I first attempted to extract logic from the code that normalizes DNs, but I was unsuccessful. This is a hack but it works.
2017-10-07 10:28:13 -07:00
Michael Kozono 689eea5a43 Fix space stripping
Especially from the last attribute value.
2017-10-07 10:28:13 -07:00
Michael Kozono 714f264d62 Rename method to `to_normalized_s` 2017-10-07 10:28:13 -07:00
Michael Kozono a6a764f73d Refactor initialize method for clarity 2017-10-07 10:28:13 -07:00
Michael Kozono b3d61832c3 Move downcasing to normalize method 2017-10-07 10:28:13 -07:00
Michael Kozono 14ed20d68a Resolve Rubocop offenses
Disabling some for now since this is based on `Net::LDAP::DN`.
2017-10-07 10:28:13 -07:00
Michael Kozono 45ab20dca9 Switch to new DN class
for normalizing and parsing DNs
2017-10-07 10:28:13 -07:00
Michael Kozono 26054114be Fix trailing escaped newline 2017-10-07 10:28:13 -07:00
Michael Kozono 66030b03dd Test malformed DNs 2017-10-07 10:28:13 -07:00
Michael Kozono 8bd59f3aeb Raise UnsupportedDnFormatError on multivalued RDNs 2017-10-07 10:28:13 -07:00
Michael Kozono 7e3eb257ba Fix for null DN 2017-10-07 10:28:13 -07:00
Michael Kozono f610fea777 Handle CR and LF characters 2017-10-07 10:28:13 -07:00
Michael Kozono c79879f33a Fix escaped equal signs 2017-10-07 10:28:12 -07:00
Michael Kozono 3fde6f6806 Fix trailing escaped space 2017-10-07 10:28:12 -07:00
Michael Kozono cb591f86e4 Fix to_s_normalize for escaped leading space 2017-10-07 10:28:12 -07:00
Michael Kozono a0d7a22e7c Always downcase DNs 2017-10-07 10:28:12 -07:00
Michael Kozono 91f2492a78 Add `DN#to_s_normalized` 2017-10-07 10:28:12 -07:00
Michael Kozono 2f11db4b00 Adapt DN class for Gitlab 2017-10-07 10:28:12 -07:00
Michael Kozono 7bc4278e07 Extract Net::LDAP::DN class from ruby-net-ldap gem 2017-10-07 10:28:12 -07:00
Michael Kozono aefc96ca27 Rely on LDAP providers giving DNs, not UIDs 2017-10-07 10:28:12 -07:00
Michael Kozono 010cd3dea8 Rescue DN normalization attempts 2017-10-07 10:28:12 -07:00
Michael Kozono ca5ade22f3 Fix `dn?` for a UID with an escaped equal sign 2017-10-07 10:28:12 -07:00
Michael Kozono fee3c95d75 Remove redundant `is_` 2017-10-07 10:28:12 -07:00
Michael Kozono a3ec58dacf Downcase normalized LDAP DNs and UIDs 2017-10-07 10:28:12 -07:00
Michael Kozono 4ae32d9577 Fix normalize behavior for escaped delimiter chars 2017-10-07 10:28:12 -07:00
Michael Kozono abe570cd0b Refactor to distinguish between UIDs and DNs 2017-10-07 10:28:12 -07:00
Michael Kozono 42bc6caee0 Trim extraneous spaces from DNs 2017-10-07 10:28:12 -07:00
Rubén Dávila 4aa2deb478 Fix error with GPG signature updater when commit was deleted 2017-10-07 10:47:53 -05:00
Douwe Maan 546b18b903 Merge branch 'tc-geo-read-only-idea' into 'master'
Create idea of read-only database

Closes #37534

See merge request gitlab-org/gitlab-ce!14688
2017-10-07 11:01:21 +00:00
Bob Van Landuyt df7f530d84 Add a migration to populate fork networks
This uses the existing ForkedProjectLinks
2017-10-07 11:46:23 +02:00
Bob Van Landuyt 70716a1292 Allow creating merge requests across forks of a project 2017-10-07 11:46:23 +02:00
Kamil Trzciński 5ee20b6375 Merge branch 'master' into '37970-ci-sections-tracking'
# Conflicts:
#   db/schema.rb
2017-10-07 08:07:33 +00:00
Felipe Artur b54203f0ad Commenting on image diffs 2017-10-07 04:25:17 +00:00
Toon Claes d13669716a Create idea of read-only database
In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo
secondary node). But in GitLab CE it also might be useful to have the
"read-only" idea around. So port it back to GitLab CE.

Also having the principle of read-only in GitLab CE would hopefully
lead to less errors introduced, doing write operations when there
aren't allowed for read-only calls.

Closes gitlab-org/gitlab-ce#37534.
2017-10-06 22:37:40 +02:00
Andrew Newdigate 1ba3c747f3 Gitaly feature flag metadata 2017-10-06 17:16:20 +00:00
Shinya Maeda 830c770a53 Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service 2017-10-07 00:27:15 +09:00
Sean McGivern f55f24c497 Merge branch 'valid-branch-name-dash-bug' into 'master'
Prevent branches or tags from starting with invalid characters (e.g. -, .)

Closes #38817

See merge request gitlab-org/gitlab-ce!14710
2017-10-06 13:40:17 +00:00
Douwe Maan dd42cb5f8f Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into 'master'
Add support for GPG subkeys in signature verification

Closes #36829

See merge request gitlab-org/gitlab-ce!14517
2017-10-06 13:36:20 +00:00