Commit 6f615500 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Move all integration docs images in a single directory

[ci skip]
parent 97b2d78d
...@@ -19,7 +19,7 @@ something else descriptive. ...@@ -19,7 +19,7 @@ something else descriptive.
1. Enter the address of your GitLab installation at the bottom of the package 1. Enter the address of your GitLab installation at the bottom of the package
![Facebook Website URL](facebook_website_url.png) ![Facebook Website URL](img/facebook_website_url.png)
1. Choose "Next" 1. Choose "Next"
...@@ -29,7 +29,7 @@ something else descriptive. ...@@ -29,7 +29,7 @@ something else descriptive.
1. Fill in a contact email for your app 1. Fill in a contact email for your app
![Facebook App Settings](facebook_app_settings.png) ![Facebook App Settings](img/facebook_app_settings.png)
1. Choose "Save Changes" 1. Choose "Save Changes"
...@@ -45,7 +45,7 @@ something else descriptive. ...@@ -45,7 +45,7 @@ something else descriptive.
1. You should now see an app key and app secret (see screenshot). Keep this page open as you continue configuration. 1. You should now see an app key and app secret (see screenshot). Keep this page open as you continue configuration.
![Facebook API Keys](facebook_api_keys.png) ![Facebook API Keys](img/facebook_api_keys.png)
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
......
...@@ -22,7 +22,7 @@ GitHub will generate an application ID and secret key for you to use. ...@@ -22,7 +22,7 @@ GitHub will generate an application ID and secret key for you to use.
1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). 1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot).
Keep this page open as you continue configuration. Keep this page open as you continue configuration.
![GitHub app](github_app.png) ![GitHub app](img/github_app.png)
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
......
...@@ -28,7 +28,7 @@ GitLab.com will generate an application ID and secret key for you to use. ...@@ -28,7 +28,7 @@ GitLab.com will generate an application ID and secret key for you to use.
1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). 1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot).
Keep this page open as you continue configuration. Keep this page open as you continue configuration.
![GitLab app](gitlab_app.png) ![GitLab app](img/gitlab_app.png)
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
......
...@@ -4,7 +4,7 @@ GitLab supports [Google actions in email](https://developers.google.com/gmail/ma ...@@ -4,7 +4,7 @@ GitLab supports [Google actions in email](https://developers.google.com/gmail/ma
If correctly setup, emails that require an action will be marked in Gmail. If correctly setup, emails that require an action will be marked in Gmail.
![gmail_actions_button.png](gmail_actions_button.png) ![gmail_actions_button.png](img/gmail_action_buttons_for_gitlab.png)
To get this functioning, you need to be registered with Google. To get this functioning, you need to be registered with Google.
[See how to register with Google in this document.](https://developers.google.com/gmail/markup/registering-with-google) [See how to register with Google in this document.](https://developers.google.com/gmail/markup/registering-with-google)
......
...@@ -25,7 +25,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application ...@@ -25,7 +25,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
- Application type: "Web Application" - Application type: "Web Application"
- Authorized JavaScript origins: This isn't really used by GitLab but go ahead and put 'https://gitlab.example.com' here. - Authorized JavaScript origins: This isn't really used by GitLab but go ahead and put 'https://gitlab.example.com' here.
- Authorized redirect URI: 'https://gitlab.example.com/users/auth/google_oauth2/callback' - Authorized redirect URI: 'https://gitlab.example.com/users/auth/google_oauth2/callback'
1. Under the heading "Client ID for web application" you should see a Client ID and Client secret (see screenshot). Keep this page open as you continue configuration. ![Google app](google_app.png) 1. Under the heading "Client ID for web application" you should see a Client ID and Client secret (see screenshot). Keep this page open as you continue configuration. ![Google app](img/google_app.png)
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
......
...@@ -15,16 +15,16 @@ GitLab has two ways to add new OAuth2 application to an instance, you can add ap ...@@ -15,16 +15,16 @@ GitLab has two ways to add new OAuth2 application to an instance, you can add ap
### Adding application through profile ### Adding application through profile
Go to your profile section 'Application' and press button 'New Application' Go to your profile section 'Application' and press button 'New Application'
![applications](oauth_provider/user_wide_applications.png) ![applications](img/oauth_provider_user_wide_applications.png)
After this you will see application form, where "Name" is arbitrary name, "Redirect URI" is URL in your app where users will be sent after authorization on GitLab.com. After this you will see application form, where "Name" is arbitrary name, "Redirect URI" is URL in your app where users will be sent after authorization on GitLab.com.
![application_form](oauth_provider/application_form.png) ![application_form](img/oauth_provider_application_form.png)
### Authorized application ### Authorized application
Every application you authorized will be shown in your "Authorized application" sections. Every application you authorized will be shown in your "Authorized application" sections.
![authorized_application](oauth_provider/authorized_application.png) ![authorized_application](img/oauth_provider_authorized_application.png)
At any time you can revoke access just clicking button "Revoke" At any time you can revoke access just clicking button "Revoke"
...@@ -32,4 +32,4 @@ At any time you can revoke access just clicking button "Revoke" ...@@ -32,4 +32,4 @@ At any time you can revoke access just clicking button "Revoke"
If you want to create application that does not belong to certain user you can create it from admin area If you want to create application that does not belong to certain user you can create it from admin area
![admin_application](oauth_provider/admin_application.png) ![admin_application](img/oauth_provider_admin_application.png)
\ No newline at end of file
...@@ -14,7 +14,7 @@ To enable the Twitter OmniAuth provider you must register your application with ...@@ -14,7 +14,7 @@ To enable the Twitter OmniAuth provider you must register your application with
- Callback URL: 'https://gitlab.example.com/users/auth/twitter/callback' - Callback URL: 'https://gitlab.example.com/users/auth/twitter/callback'
- Agree to the "Developer Agreement". - Agree to the "Developer Agreement".
![Twitter App Details](twitter_app_details.png) ![Twitter App Details](img/twitter_app_details.png)
1. Select "Create your Twitter application." 1. Select "Create your Twitter application."
1. Select the "Settings" tab. 1. Select the "Settings" tab.
...@@ -27,7 +27,7 @@ To enable the Twitter OmniAuth provider you must register your application with ...@@ -27,7 +27,7 @@ To enable the Twitter OmniAuth provider you must register your application with
1. You should now see an API key and API secret (see screenshot). Keep this page open as you continue configuration. 1. You should now see an API key and API secret (see screenshot). Keep this page open as you continue configuration.
![Twitter app](twitter_app_api_keys.png) ![Twitter app](img/twitter_app_api_keys.png)
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
...@@ -76,4 +76,4 @@ To enable the Twitter OmniAuth provider you must register your application with ...@@ -76,4 +76,4 @@ To enable the Twitter OmniAuth provider you must register your application with
1. Restart GitLab for the changes to take effect. 1. Restart GitLab for the changes to take effect.
On the sign in page there should now be a Twitter icon below the regular sign in form. Click the icon to begin the authentication process. Twitter will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in. On the sign in page there should now be a Twitter icon below the regular sign in form. Click the icon to begin the authentication process. Twitter will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in.
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment