summaryrefslogtreecommitdiff
path: root/doc/integration
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch '25851-document-token-scopes' into 'master' Rémy Coutable2017-01-201-3/+5
|\ | | | | | | | | | | | | Add documentation around OAuth/Personal Access Token scopes. Closes #25851 See merge request !8226
| * Add documentation around OAuth/Personal Access Token scopes.Timothy Andrew2017-01-191-3/+5
| |
* | Document the `auto_link_ldap_user` settingNick Thomas2017-01-131-0/+10
| |
* | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
* | List all commandsZ.J. van de Weg2016-12-221-0/+14
| | | | | | | | [ci skip]
* | Update Bitbucket callback URL documentationStan Hu2016-12-211-1/+5
|/ | | | | | Closes #25950 [ci skip]
* Added support for Authentiq oauth providerAlex2016-12-212-1/+2
|
* Add Wiki import to BB importerValery Sizov2016-12-192-1/+2
|
* Refactor Bitbucket import docsAchilleas Pipinellis2016-12-162-10/+8
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-141-1/+1
|\
| * NIGNX -> Nginxfix-nignx-typoSean McGivern2016-12-051-1/+1
| | | | | | | | This shouldn't be in all caps, and it should be spelled correctly!
* | Update documentation for BitBucketValery Sizov2016-12-082-92/+7
|/
* Fixing typo & Clarifying Key nameLee Matos2016-11-291-2/+2
|
* Add missing JIRA file that redirects to the new locationAchilleas Pipinellis2016-11-241-0/+3
| | | | [ci skip]
* Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-11-221-1/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update github.md Hi, I ran into a few pitfalls while I enabled OmniAuth to be able to migrate repos from github to my omnibus-gitlab instance today, so here are my findings: These docs state thate the default authorization callback URL is `'${YOUR_DOMAIN}/import/github/callback'`, but the screenshot only shows `'${YOUR_DOMAIN}'`, which works, so I removed the ambiguity. When editing `gitlab_rails['omniauth_providers']` for github.com, you have to omit the `"url" => "https://github.com/",` part, otherwise it won't work (OmniAuth will stay deactivated). This is backed by the configuration details of the "from-source-installation" which also omits the url in the `yml` file. After changing the `gitlab.rb` file, `sudo gitlab-ctl reconfigure` needs to be run, which is missing in the docs. Following the updated version of this documentation I was able to enable OmniAuth. If anything I edited is wrong, please correct me, as I don't know how the "from-source-installations" would react to my changes. Best regards, Florian See merge request !4072
| * Update github.mdFlorian2016-10-211-1/+16
| |
* | Reduce size of images from 25MB to 13MB using pngquantAchilleas Pipinellis2016-11-2220-0/+0
| | | | | | | | | | | | Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232 [ci skip]
* | Move JIRA service doc back to its old locationAchilleas Pipinellis2016-11-2216-201/+1
| |
* | Add remove links to JIRA documentationFelipe Artur2016-11-224-2/+5
| |
* | Revert "Merge branch 'docs/jira-old' into 'master'"Achilleas Pipinellis2016-11-222-2/+196
| | | | | | This reverts merge request !7365
* | Merge branch 'patch-9' into 'master' Sean McGivern2016-11-151-1/+5
|\ \ | | | | | | | | | | | | clarify best way to install custom CA See merge request !7434
| * | clarify best way to install custom CABen Bodenmiller2016-11-141-1/+5
| | |
* | | fix Super User spacingBen Bodenmiller2016-11-121-1/+1
|/ /
* | Use GitLab.com link, remove GitHub linkmrchrisw/fix-github-linkChris Wilson2016-11-111-1/+1
| |
* | Bring back the old JIRA docsAchilleas Pipinellis2016-11-082-196/+2
| | | | | | | | | | | | https://gitlab.zendesk.com/agent/tickets/48003 [ci skip]
* | GitLab 8.13 not 13mrchrisw/gitlab-version-fixChris Wilson2016-11-021-2/+2
| |
* | fix how to get SAML error detailsBen Bodenmiller2016-10-311-7/+14
| |
* | Finish updates to use JIRA gemFelipe Artur2016-10-2614-60/+132
| | | | | | | | Code improvements, bug fixes, finish documentation and specs
* | Refactor JIRA service to use gemDrew Blessing2016-10-263-39/+161
|/
* More Bitbucket integration refactoringrdoursenaud/gitlab-ce-omniauth-bitbucketAchilleas Pipinellis2016-08-303-39/+50
|
* Refactor Bitbucket integration documentationAchilleas Pipinellis2016-08-302-75/+119
|
* Updated Bitbucket OmniAuth documentation for omnibus packageRaphaël Doursenaud2016-08-301-2/+10
|
* Updated Bitbucket OmniAuth documentationRaphaël Doursenaud2016-08-301-3/+11
|
* Fix wrong Koding linkdoc/fix-koding-integration-linkAchilleas Pipinellis2016-08-251-1/+1
|
* Split Koding admin/user docsAchilleas Pipinellis2016-08-2216-361/+0
|
* Support integration with Koding (online IDE)Gokmen Goksel2016-08-1917-0/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Koding: #index: landing page for Koding integration If enabled it will provide a link to open remote Koding instance url for now we are also providing the sneak preview video for how integration works in detail. Repository: check whether .koding.yml file exists on repository Projects: landing page: show Run in IDE (Koding) button if repo has stack file Projects: MR: show Run in IDE Koding button if repo has stack file on active branch ProjectHelpers: add_koding_stack: stack generator for provided project With this helper we will auto-generate the required stack template for a given project. For the feature we can request this base template from the running Koding instance on integration. Currently this will provide users to create a t2.nano instance on aws and it'll automatically configures the instance for basic requirements. Projects: empty state and landing page provide shortcuts to create stack projects_helper: use branch on checkout and provide an entry point This ${var.koding_queryString_branch} will be replaced with the branch provided in query string which will allow us to use same stack template for different branches of the same repository. ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b projects_helper: provide sha info in query string to use existing vms With this change we'll be able to query existing vms on Koding side based on the commit id that they've created. ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343 Integration: Docs: Koding documentation added Disable /koding route if integration is disabled Use application settings to enable Koding Projects_helper: better indentation with strip_heredoc usage Projects_helper: return koding_url as is if there is no project provided current_settings: set koding_enabled: false by default Koding_Controller: to render not_found once integration is disabled Dashboard_specs: update spec for Koding enabled case Projects_Helper: make repo dynamic ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c Updated documentation to have right format
* Updated Akismet documentationPatricio Cano2016-08-162-4/+4
|
* Added Documentation and CHANGELOGPatricio Cano2016-08-153-0/+23
|
* Merge branch 'fix-angle-brackets-in-docs' into 'master' Achilleas Pipinellis2016-08-104-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix escaped angle bracket's in integration documentation. There are several escaped angle brackets in our integration docs. While these render fine within GitLab, they are broken when rendered on doc.gitlab.com because pandoc does not escape them correctly. You can see the problem here: http://doc.gitlab.com/ce/integration/github.html Note that the strings `<Organization>` and `<Your Name>` are being interpreted as html tags. It looks like doc.gitlab.com is using pandoc: https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/generate.rb#L64 You can verify these changes by running something like this and then inspecting `test.html`: pandoc --from markdown_github-hard_line_breaks -o test.html doc/integration/twitter.md You can also verify that GitLab continues to render the docs correctly by checking, for example, http://localhost:3000/help/integration/twitter.md See merge request !4128
| * Fix escaped angle bracket's in integration documentation.Eric K Idema2016-05-124-4/+4
| | | | | | | | | | | | There are several escaped angle brackets in our integration docs. While these render fine within GitLab, they are broken rendered on doc.gitlab.com because pandoc does not escape them correctly.
* | Refactor spam validation to a concern that can be easily reused and improve ↵akismet-ui-checkPatricio Cano2016-07-261-1/+1
| | | | | | | | legibility in `SpamCheckService`
* | Submit all issues on public projects to Akismet if enabled.Patricio Cano2016-07-261-5/+7
| |
* | Submit new issues created via the WebUI by non project members to Akismet ↵Patricio Cano2016-07-261-0/+3
| | | | | | | | for spam check.
* | Refactor Slack service documentationAchilleas Pipinellis2016-07-222-41/+1
| | | | | | | | [ci skip]
* | Refactor service settings viewissue_8110Felipe Artur2016-07-201-1/+1
| |
* | Add project service documentation and update integration documentationFelipe Artur2016-07-191-3/+2
| |
* | Include default callback URL (OAuth)Chris Wilson2016-07-141-1/+2
| |
* | Change URLs to new permissions.md locationAchilleas Pipinellis2016-07-121-2/+2
| |
* | Merge branch 'clarify-github-integration-docs' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix documentation for Github integration authorization callback url. There are two callbacks that could be used with Github integration: * /import/github/callback (used by project import) * /users/auth/github/callback (used by OmniAuth) Github's documentation suggests that authorization callback url should be set to the longest common path. https://developer.github.com/v3/oauth/#redirect-urls Configuring according to the previous documentation resulted in a redirect_uri_mismatch error from Github when logging in via OmniAuth. See merge request !4111
| * | Fix documentation for Github integration authorization callback url.Eric K Idema2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two callbacks that could be used with Github integration: * /import/github/callback (used by project import) * /users/auth/github/callback (used by OmniAuth) Github's documentation suggests that authorization callback url should be set to the longest common path. https://developer.github.com/v3/oauth/#redirect-urls Configuring according to the previous documentation resulted in a redirect_uri_mismatch error from Github when logging in via OmniAuth.