Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
3f161a3a
Commit
3f161a3a
authored
Aug 19, 2014
by
Robert Schilling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update omniauth-google-oauth2 gem
Udate doc
parent
0b3ebb64
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
12 deletions
+16
-12
Gemfile.lock
Gemfile.lock
+7
-7
doc/integration/google.md
doc/integration/google.md
+9
-5
No files found.
Gemfile.lock
View file @
3f161a3a
...
@@ -129,7 +129,7 @@ GEM
...
@@ -129,7 +129,7 @@ GEM
factory_girl_rails (4.3.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
factory_girl (~> 4.3.0)
railties (>= 3.0.0)
railties (>= 3.0.0)
faraday (0.8.
8
)
faraday (0.8.
9
)
multipart-post (~> 1.2.0)
multipart-post (~> 1.2.0)
faraday_middleware (0.9.0)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
faraday (>= 0.7.4, < 0.9)
...
@@ -234,7 +234,7 @@ GEM
...
@@ -234,7 +234,7 @@ GEM
activesupport (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0)
haml (>= 3.1, < 5.0)
railties (>= 4.0.1)
railties (>= 4.0.1)
hashie (2.
0.5
)
hashie (2.
1.2
)
hike (1.2.3)
hike (1.2.3)
hipchat (0.14.0)
hipchat (0.14.0)
httparty
httparty
...
@@ -243,7 +243,7 @@ GEM
...
@@ -243,7 +243,7 @@ GEM
httparty (0.13.0)
httparty (0.13.0)
json (~> 1.8)
json (~> 1.8)
multi_xml (>= 0.5.2)
multi_xml (>= 0.5.2)
httpauth (0.2.
0
)
httpauth (0.2.
1
)
i18n (0.6.11)
i18n (0.6.11)
ice_nine (0.10.0)
ice_nine (0.10.0)
jasmine (2.0.2)
jasmine (2.0.2)
...
@@ -264,7 +264,7 @@ GEM
...
@@ -264,7 +264,7 @@ GEM
jquery-ui-rails (4.2.1)
jquery-ui-rails (4.2.1)
railties (>= 3.2.16)
railties (>= 3.2.16)
json (1.8.1)
json (1.8.1)
jwt (0.1.
8
)
jwt (0.1.
13
)
multi_json (>= 1.5)
multi_json (>= 1.5)
kaminari (0.15.1)
kaminari (0.15.1)
actionpack (>= 3.0.0)
actionpack (>= 3.0.0)
...
@@ -311,9 +311,9 @@ GEM
...
@@ -311,9 +311,9 @@ GEM
omniauth-github (1.1.1)
omniauth-github (1.1.1)
omniauth (~> 1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (~> 1.1)
omniauth-google-oauth2 (0.2.
1
)
omniauth-google-oauth2 (0.2.
5
)
omniauth (
~
> 1.0)
omniauth (> 1.0)
omniauth-oauth2
omniauth-oauth2
(~> 1.1)
omniauth-oauth (1.0.1)
omniauth-oauth (1.0.1)
oauth
oauth
omniauth (~> 1.0)
omniauth (~> 1.0)
...
...
doc/integration/google.md
View file @
3f161a3a
...
@@ -13,6 +13,10 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
...
@@ -13,6 +13,10 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
1.
Select "APIs & auth" in the left menu.
1.
Select "APIs & auth" in the left menu.
1.
Select "APIs" in the submenu.
-
Enable
`Contacts API`
-
Enable
`Google+ API`
1.
Select "Credentials" in the submenu.
1.
Select "Credentials" in the submenu.
1.
Select "Create New Client ID".
1.
Select "Create New Client ID".
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment