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
Boxiang Sun
gitlab-ce
Commits
454810fe
Commit
454810fe
authored
Mar 09, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
7e574a89
410c8024
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
doc/integration/github.md
doc/integration/github.md
+2
-2
doc/integration/gitlab.md
doc/integration/gitlab.md
+2
-2
doc/integration/google.md
doc/integration/google.md
+1
-1
No files found.
doc/integration/github.md
View file @
454810fe
...
@@ -53,7 +53,7 @@ GitHub will generate an application ID and secret key for you to use.
...
@@ -53,7 +53,7 @@ GitHub will generate an application ID and secret key for you to use.
"app_id" => "YOUR_APP_ID",
"app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET",
"app_secret" => "YOUR_APP_SECRET",
"url" => "https://github.com/",
"url" => "https://github.com/",
"args" => { "scope" => "user:email" }
}
"args" => { "scope" => "user:email" }
}
}
]
]
```
```
...
...
doc/integration/gitlab.md
View file @
454810fe
...
@@ -58,7 +58,7 @@ GitLab.com will generate an application ID and secret key for you to use.
...
@@ -58,7 +58,7 @@ GitLab.com will generate an application ID and secret key for you to use.
"name" => "gitlab",
"name" => "gitlab",
"app_id" => "YOUR_APP_ID",
"app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET",
"app_secret" => "YOUR_APP_SECRET",
"args" => { "scope" => "api" }
}
"args" => { "scope" => "api" }
}
}
]
]
```
```
...
...
doc/integration/google.md
View file @
454810fe
...
@@ -55,7 +55,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
...
@@ -55,7 +55,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
"name" => "google_oauth2",
"name" => "google_oauth2",
"app_id" => "YOUR_APP_ID",
"app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET",
"app_secret" => "YOUR_APP_SECRET",
"args" => { "access_type" => "offline", "approval_prompt" => '' }
}
"args" => { "access_type" => "offline", "approval_prompt" => '' }
}
}
]
]
```
```
...
...
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