Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-23 01:50:15 +0300
committerDouwe Maan <douwe@selenight.nl>2017-02-23 18:33:05 +0300
commit1fe7501b49f896b74102c4b970310aa9ae34da85 (patch)
treece271afb0fbaaa14291c1dc9009cd7815ee25463 /lib/gitlab/github_import
parentbdbc7d967a0c3d95d5e4ea19a2a5be41268d3540 (diff)
Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
Diffstat (limited to 'lib/gitlab/github_import')
-rw-r--r--lib/gitlab/github_import/importer.rb6
-rw-r--r--lib/gitlab/github_import/user_formatter.rb14
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index dc73cad93a5..a160869541a 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -178,9 +178,9 @@ module Gitlab
def apply_labels(issuable, raw)
return unless raw.labels.count > 0
- label_ids = raw.labels
- .map { |attrs| @labels[attrs.name] }
- .compact
+ label_ids = raw.labels.
+ map { |attrs| @labels[attrs.name] }.
+ compact
issuable.update_attribute(:label_ids, label_ids)
end
diff --git a/lib/gitlab/github_import/user_formatter.rb b/lib/gitlab/github_import/user_formatter.rb
index 04c2964da20..7f3bf0052a7 100644
--- a/lib/gitlab/github_import/user_formatter.rb
+++ b/lib/gitlab/github_import/user_formatter.rb
@@ -25,8 +25,8 @@ module Gitlab
def find_by_email
return nil unless email
- User.find_by_any_email(email)
- .try(:id)
+ User.find_by_any_email(email).
+ try(:id)
end
def find_by_external_uid
@@ -34,11 +34,11 @@ module Gitlab
identities = ::Identity.arel_table
- User.select(:id)
- .joins(:identities).where(identities[:provider].eq(:github)
- .and(identities[:extern_uid].eq(id)))
- .first
- .try(:id)
+ User.select(:id).
+ joins(:identities).where(identities[:provider].eq(:github).
+ and(identities[:extern_uid].eq(id))).
+ first.
+ try(:id)
end
end
end