summaryrefslogtreecommitdiff
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upload-xss-access-control' into 'master'Marin Jankovski2015-02-202-4/+9
* Merge branch 'improve-web-hooks' into 'master'Dmitriy Zaporozhets2015-02-202-6/+32
* Remove Group#owner_id from API since it is not used any moreDmitriy Zaporozhets2015-02-181-2/+0
* Use correct shell version in update doc.Marin Jankovski2015-02-161-2/+2
* Updated the installation and update guidesPatricio Cano2015-02-164-16/+138
* Rephrased wording in the documentation to say "installation from source" inst...Patricio Cano2015-02-167-10/+10
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-151-2/+2
|\
| * Fix wrong word in document of google oauthZhang Sen2015-02-151-2/+2
* | Update oauth documenatation with examples for omnibus package and installatio...Marin Jankovski2015-02-136-81/+168
|/
* Merge branch 'improve_doc' into 'master'Dmitriy Zaporozhets2015-02-135-0/+20
|\
| * GitLab.com importer: documentationValery Sizov2015-02-135-0/+20
* | Merge branch 'log_doc' into 'master'Dmitriy Zaporozhets2015-02-132-0/+101
|\ \
| * | log documentationValery Sizov2015-02-132-0/+101
| |/
* | Merge branch 'oauth2_doc' into 'master'Dmitriy Zaporozhets2015-02-136-1/+33
|\ \
| * | OAuth2 provider documentationValery Sizov2015-02-136-1/+33
| |/
* | Merge branch 'add_tracker_integration_doc' into 'master'Dmitriy Zaporozhets2015-02-133-5/+30
|\ \ | |/ |/|
| * Text changes recommended by Job.Marin Jankovski2015-02-131-5/+5
| * Explained in the integration documentation how to enable external issue trackerMarin Jankovski2015-02-123-5/+30
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-1232-1/+33
|\ \ | |/ |/|
| * Merge pull request #8739 from jvanbaarsen/pr/7818Jeroen van Baarsen2015-02-1232-1/+33
| |\
| | * note about latest details being on master branchBen Bodenmiller2015-02-0532-1/+33
* | | Use gitattribute merge=union to reduce CHANGELOG merge conflicts.Douwe Maan2015-02-121-8/+1
* | | Edit group members via APIVinnie Okada2015-02-111-0/+14
|/ /
* | Merge pull request #8778 from al3x-edge/fix-emoji-linkSytse Sijbrandij2015-02-111-2/+2
|\ \
| * | Change emoji cheat sheet link to Amazon S3Alexander Ambrose2015-02-111-2/+2
* | | Fix two broken links in the installation section.Ewan Edwards2015-02-111-2/+4
|/ /
* | Update patch release documentDmitriy Zaporozhets2015-02-091-5/+5
* | Update GitLab.com when packages are done. No need to wait 2 days for itDmitriy Zaporozhets2015-02-091-4/+1
* | Extract update guide to separate doc to prevent messDmitriy Zaporozhets2015-02-092-53/+56
* | Merge pull request #8620 from namnatulco/masterJeroen van Baarsen2015-02-091-0/+2
|\ \
| * | Added a note saying inline HTML is disabled by defaultRens van der Heijden2015-01-211-0/+2
* | | Merge branch 'webhooks-and-internal-services' into 'master'Sytse Sijbrandij2015-02-072-0/+14
|\ \ \
| * | | Add doc on "Web Hooks and insecure internal web services".Douwe Maan2015-02-072-0/+14
* | | | Merge branch 'mention-groups'Dmitriy Zaporozhets2015-02-061-1/+1
|\ \ \ \
| * | | | Allow groups to be mentioned.Douwe Maan2015-02-051-1/+1
* | | | | Merge branch 'api-default-order' into 'master'Dmitriy Zaporozhets2015-02-063-5/+25
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Refactor and improve sorting objects in API for projects, issues and merge re...Dmitriy Zaporozhets2015-02-053-5/+25
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqValery Sizov2015-02-051-2/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #8318 from bbodenmiller/patch-9Jeroen van Baarsen2015-02-051-2/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | add editor command to update database.yml; cleanupBen Bodenmiller2014-11-231-2/+5
* | | | | GitLab.com integration: refactoringValery Sizov2015-02-051-1/+1
* | | | | GitLab integration. ImporterValery Sizov2015-02-051-0/+54
|/ / / /
* | | | Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpointDmitriy Zaporozhets2015-02-041-0/+70
|\ \ \ \
| * | | | Added a way to retrieve MR filesJeroen van Baarsen2015-02-041-0/+70
* | | | | Merge branch 'consolidate_ssh_docs' into 'master'Marin Jankovski2015-02-0431-121/+143
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Consolidate the SSH topics into a single file, since the twoEwan Edwards2015-02-043-49/+71
| * | | | Fix a number of discovered typos, capitalization of developer andEwan Edwards2015-02-0328-72/+72
* | | | | Merge branch 'doc_cookbook_uses_omnibus' into 'master'Marin Jankovski2015-02-045-17/+17
|\ \ \ \ \
| * | | | | Drop comments on cookbook installing from source now that it uses Omnibus.Achilleas Pipinellis2015-01-285-17/+17
* | | | | | Merge branch 'add_more_maintenance_tasks' into 'master'Dmitriy Zaporozhets2015-02-041-22/+52
|\ \ \ \ \ \