summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Shutsin <pshutsin@gitlab.com>2019-05-20 13:05:16 +0300
committerPavel Shutsin <pshutsin@gitlab.com>2019-05-27 12:10:54 +0300
commit34d631ed47cfa8cb9a08e4b2cdc34a83bea74a39 (patch)
tree3023681651ef30827c2777a646b5c08e19eb0570
parent863f1b1d25e6a7dbc4fbb762a5da5cbd88badb60 (diff)
downloadgitlab-ce-ce-5292-new-user-flow-for-group-managed-accounts.tar.gz
Use hash-like notation for oauth datace-5292-new-user-flow-for-group-managed-accounts
It will allow easier mocking in tests
-rw-r--r--lib/gitlab/auth/o_auth/auth_hash.rb2
-rw-r--r--locale/gitlab.pot6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/auth/o_auth/auth_hash.rb b/lib/gitlab/auth/o_auth/auth_hash.rb
index 36fc8061d92..72a187377d0 100644
--- a/lib/gitlab/auth/o_auth/auth_hash.rb
+++ b/lib/gitlab/auth/o_auth/auth_hash.rb
@@ -55,7 +55,7 @@ module Gitlab
private
def info
- auth_hash.info
+ auth_hash['info']
end
def get_info(key)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b6c33999a91..27d460c19a0 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7081,15 +7081,15 @@ msgstr ""
msgid "Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access."
msgstr ""
-msgid "Please select a file"
-msgstr ""
-
msgid "Please provide a valid email address."
msgstr ""
msgid "Please retype the email address."
msgstr ""
+msgid "Please select a file"
+msgstr ""
+
msgid "Please select a group."
msgstr ""