From 6f615500a98c3375d80f5d5aff5b76a8216db0ca Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Sun, 24 Jan 2016 21:22:19 +0100 Subject: Move all integration docs images in a single directory [ci skip] --- doc/integration/facebook.md | 6 +++--- doc/integration/facebook_api_keys.png | Bin 125921 -> 0 bytes doc/integration/facebook_app_settings.png | Bin 134387 -> 0 bytes doc/integration/facebook_website_url.png | Bin 42292 -> 0 bytes doc/integration/github.md | 2 +- doc/integration/github_app.png | Bin 75297 -> 0 bytes doc/integration/gitlab.md | 2 +- doc/integration/gitlab_app.png | Bin 55325 -> 0 bytes doc/integration/gmail_action_buttons_for_gitlab.md | 2 +- doc/integration/gmail_actions_button.png | Bin 17321 -> 0 bytes doc/integration/google.md | 2 +- doc/integration/google_app.png | Bin 52669 -> 0 bytes doc/integration/img/facebook_api_keys.png | Bin 0 -> 125921 bytes doc/integration/img/facebook_app_settings.png | Bin 0 -> 134387 bytes doc/integration/img/facebook_website_url.png | Bin 0 -> 42292 bytes doc/integration/img/github_app.png | Bin 0 -> 75297 bytes doc/integration/img/gitlab_app.png | Bin 0 -> 55325 bytes .../img/gmail_action_buttons_for_gitlab.png | Bin 0 -> 17321 bytes doc/integration/img/google_app.png | Bin 0 -> 52669 bytes .../img/oauth_provider_admin_application.png | Bin 0 -> 55533 bytes .../img/oauth_provider_application_form.png | Bin 0 -> 25075 bytes .../img/oauth_provider_authorized_application.png | Bin 0 -> 17260 bytes .../img/oauth_provider_user_wide_applications.png | Bin 0 -> 46238 bytes doc/integration/img/twitter_app_api_keys.png | Bin 0 -> 72200 bytes doc/integration/img/twitter_app_details.png | Bin 0 -> 121621 bytes doc/integration/jira-integration-points.png | Bin 67854 -> 0 bytes doc/integration/oauth_provider.md | 8 ++++---- doc/integration/oauth_provider/admin_application.png | Bin 55533 -> 0 bytes doc/integration/oauth_provider/application_form.png | Bin 25075 -> 0 bytes .../oauth_provider/authorized_application.png | Bin 17260 -> 0 bytes .../oauth_provider/user_wide_applications.png | Bin 46238 -> 0 bytes doc/integration/twitter.md | 6 +++--- doc/integration/twitter_app_api_keys.png | Bin 72200 -> 0 bytes doc/integration/twitter_app_details.png | Bin 121621 -> 0 bytes 34 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 doc/integration/facebook_api_keys.png delete mode 100644 doc/integration/facebook_app_settings.png delete mode 100644 doc/integration/facebook_website_url.png delete mode 100644 doc/integration/github_app.png delete mode 100644 doc/integration/gitlab_app.png delete mode 100644 doc/integration/gmail_actions_button.png delete mode 100644 doc/integration/google_app.png create mode 100644 doc/integration/img/facebook_api_keys.png create mode 100644 doc/integration/img/facebook_app_settings.png create mode 100644 doc/integration/img/facebook_website_url.png create mode 100644 doc/integration/img/github_app.png create mode 100644 doc/integration/img/gitlab_app.png create mode 100644 doc/integration/img/gmail_action_buttons_for_gitlab.png create mode 100644 doc/integration/img/google_app.png create mode 100644 doc/integration/img/oauth_provider_admin_application.png create mode 100644 doc/integration/img/oauth_provider_application_form.png create mode 100644 doc/integration/img/oauth_provider_authorized_application.png create mode 100644 doc/integration/img/oauth_provider_user_wide_applications.png create mode 100644 doc/integration/img/twitter_app_api_keys.png create mode 100644 doc/integration/img/twitter_app_details.png delete mode 100644 doc/integration/jira-integration-points.png delete mode 100644 doc/integration/oauth_provider/admin_application.png delete mode 100644 doc/integration/oauth_provider/application_form.png delete mode 100644 doc/integration/oauth_provider/authorized_application.png delete mode 100644 doc/integration/oauth_provider/user_wide_applications.png delete mode 100644 doc/integration/twitter_app_api_keys.png delete mode 100644 doc/integration/twitter_app_details.png diff --git a/doc/integration/facebook.md b/doc/integration/facebook.md index bc1f1673086..77bb75cbfca 100644 --- a/doc/integration/facebook.md +++ b/doc/integration/facebook.md @@ -19,7 +19,7 @@ something else descriptive. 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" @@ -29,7 +29,7 @@ something else descriptive. 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" @@ -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. - ![Facebook API Keys](facebook_api_keys.png) + ![Facebook API Keys](img/facebook_api_keys.png) 1. On your GitLab server, open the configuration file. diff --git a/doc/integration/facebook_api_keys.png b/doc/integration/facebook_api_keys.png deleted file mode 100644 index d6c44ac0f11..00000000000 Binary files a/doc/integration/facebook_api_keys.png and /dev/null differ diff --git a/doc/integration/facebook_app_settings.png b/doc/integration/facebook_app_settings.png deleted file mode 100644 index 30dd21e198a..00000000000 Binary files a/doc/integration/facebook_app_settings.png and /dev/null differ diff --git a/doc/integration/facebook_website_url.png b/doc/integration/facebook_website_url.png deleted file mode 100644 index dc3088bb2fa..00000000000 Binary files a/doc/integration/facebook_website_url.png and /dev/null differ diff --git a/doc/integration/github.md b/doc/integration/github.md index a789d2c814f..886784a27c9 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -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). 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. diff --git a/doc/integration/github_app.png b/doc/integration/github_app.png deleted file mode 100644 index d890345ced9..00000000000 Binary files a/doc/integration/github_app.png and /dev/null differ diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md index 80e3c0142a0..b215cc7c609 100644 --- a/doc/integration/gitlab.md +++ b/doc/integration/gitlab.md @@ -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). 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. diff --git a/doc/integration/gitlab_app.png b/doc/integration/gitlab_app.png deleted file mode 100644 index 3f9391a821b..00000000000 Binary files a/doc/integration/gitlab_app.png and /dev/null differ diff --git a/doc/integration/gmail_action_buttons_for_gitlab.md b/doc/integration/gmail_action_buttons_for_gitlab.md index de45f25ad62..05a91d9bef9 100644 --- a/doc/integration/gmail_action_buttons_for_gitlab.md +++ b/doc/integration/gmail_action_buttons_for_gitlab.md @@ -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. -![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. [See how to register with Google in this document.](https://developers.google.com/gmail/markup/registering-with-google) diff --git a/doc/integration/gmail_actions_button.png b/doc/integration/gmail_actions_button.png deleted file mode 100644 index b08f54d137b..00000000000 Binary files a/doc/integration/gmail_actions_button.png and /dev/null differ diff --git a/doc/integration/google.md b/doc/integration/google.md index 91e9b2495cc..f9a20dd840d 100644 --- a/doc/integration/google.md +++ b/doc/integration/google.md @@ -25,7 +25,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your 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 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. diff --git a/doc/integration/google_app.png b/doc/integration/google_app.png deleted file mode 100644 index 5a62ad35009..00000000000 Binary files a/doc/integration/google_app.png and /dev/null differ diff --git a/doc/integration/img/facebook_api_keys.png b/doc/integration/img/facebook_api_keys.png new file mode 100644 index 00000000000..d6c44ac0f11 Binary files /dev/null and b/doc/integration/img/facebook_api_keys.png differ diff --git a/doc/integration/img/facebook_app_settings.png b/doc/integration/img/facebook_app_settings.png new file mode 100644 index 00000000000..30dd21e198a Binary files /dev/null and b/doc/integration/img/facebook_app_settings.png differ diff --git a/doc/integration/img/facebook_website_url.png b/doc/integration/img/facebook_website_url.png new file mode 100644 index 00000000000..dc3088bb2fa Binary files /dev/null and b/doc/integration/img/facebook_website_url.png differ diff --git a/doc/integration/img/github_app.png b/doc/integration/img/github_app.png new file mode 100644 index 00000000000..d890345ced9 Binary files /dev/null and b/doc/integration/img/github_app.png differ diff --git a/doc/integration/img/gitlab_app.png b/doc/integration/img/gitlab_app.png new file mode 100644 index 00000000000..3f9391a821b Binary files /dev/null and b/doc/integration/img/gitlab_app.png differ diff --git a/doc/integration/img/gmail_action_buttons_for_gitlab.png b/doc/integration/img/gmail_action_buttons_for_gitlab.png new file mode 100644 index 00000000000..b08f54d137b Binary files /dev/null and b/doc/integration/img/gmail_action_buttons_for_gitlab.png differ diff --git a/doc/integration/img/google_app.png b/doc/integration/img/google_app.png new file mode 100644 index 00000000000..5a62ad35009 Binary files /dev/null and b/doc/integration/img/google_app.png differ diff --git a/doc/integration/img/oauth_provider_admin_application.png b/doc/integration/img/oauth_provider_admin_application.png new file mode 100644 index 00000000000..a5f34512aa8 Binary files /dev/null and b/doc/integration/img/oauth_provider_admin_application.png differ diff --git a/doc/integration/img/oauth_provider_application_form.png b/doc/integration/img/oauth_provider_application_form.png new file mode 100644 index 00000000000..ae135db2627 Binary files /dev/null and b/doc/integration/img/oauth_provider_application_form.png differ diff --git a/doc/integration/img/oauth_provider_authorized_application.png b/doc/integration/img/oauth_provider_authorized_application.png new file mode 100644 index 00000000000..d3ce05be9cc Binary files /dev/null and b/doc/integration/img/oauth_provider_authorized_application.png differ diff --git a/doc/integration/img/oauth_provider_user_wide_applications.png b/doc/integration/img/oauth_provider_user_wide_applications.png new file mode 100644 index 00000000000..719e1974068 Binary files /dev/null and b/doc/integration/img/oauth_provider_user_wide_applications.png differ diff --git a/doc/integration/img/twitter_app_api_keys.png b/doc/integration/img/twitter_app_api_keys.png new file mode 100644 index 00000000000..1076337172a Binary files /dev/null and b/doc/integration/img/twitter_app_api_keys.png differ diff --git a/doc/integration/img/twitter_app_details.png b/doc/integration/img/twitter_app_details.png new file mode 100644 index 00000000000..b95e8af8a74 Binary files /dev/null and b/doc/integration/img/twitter_app_details.png differ diff --git a/doc/integration/jira-integration-points.png b/doc/integration/jira-integration-points.png deleted file mode 100644 index 0692a7b458a..00000000000 Binary files a/doc/integration/jira-integration-points.png and /dev/null differ diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index 192c321f712..dbe5a175c82 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -15,16 +15,16 @@ GitLab has two ways to add new OAuth2 application to an instance, you can add ap ### Adding application through profile 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. -![application_form](oauth_provider/application_form.png) +![application_form](img/oauth_provider_application_form.png) ### Authorized application 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" @@ -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 -![admin_application](oauth_provider/admin_application.png) \ No newline at end of file +![admin_application](img/oauth_provider_admin_application.png) diff --git a/doc/integration/oauth_provider/admin_application.png b/doc/integration/oauth_provider/admin_application.png deleted file mode 100644 index a5f34512aa8..00000000000 Binary files a/doc/integration/oauth_provider/admin_application.png and /dev/null differ diff --git a/doc/integration/oauth_provider/application_form.png b/doc/integration/oauth_provider/application_form.png deleted file mode 100644 index ae135db2627..00000000000 Binary files a/doc/integration/oauth_provider/application_form.png and /dev/null differ diff --git a/doc/integration/oauth_provider/authorized_application.png b/doc/integration/oauth_provider/authorized_application.png deleted file mode 100644 index d3ce05be9cc..00000000000 Binary files a/doc/integration/oauth_provider/authorized_application.png and /dev/null differ diff --git a/doc/integration/oauth_provider/user_wide_applications.png b/doc/integration/oauth_provider/user_wide_applications.png deleted file mode 100644 index 719e1974068..00000000000 Binary files a/doc/integration/oauth_provider/user_wide_applications.png and /dev/null differ diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md index 52ed4a22339..4769f26b259 100644 --- a/doc/integration/twitter.md +++ b/doc/integration/twitter.md @@ -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' - 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 the "Settings" tab. @@ -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. - ![Twitter app](twitter_app_api_keys.png) + ![Twitter app](img/twitter_app_api_keys.png) 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 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. \ No newline at end of file +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. diff --git a/doc/integration/twitter_app_api_keys.png b/doc/integration/twitter_app_api_keys.png deleted file mode 100644 index 1076337172a..00000000000 Binary files a/doc/integration/twitter_app_api_keys.png and /dev/null differ diff --git a/doc/integration/twitter_app_details.png b/doc/integration/twitter_app_details.png deleted file mode 100644 index b95e8af8a74..00000000000 Binary files a/doc/integration/twitter_app_details.png and /dev/null differ -- cgit v1.2.1