Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove Group#owner_id from API since it is not used any more | Dmitriy Zaporozhets | 2015-02-17 | 1 | -2/+0 |
| | |||||
* | Use correct shell version in update doc. | Marin Jankovski | 2015-02-16 | 1 | -2/+2 |
| | |||||
* | Updated the installation and update guides | Patricio Cano | 2015-02-16 | 4 | -16/+138 |
| | |||||
* | Rephrased wording in the documentation to say "installation from source" ↵ | Patricio Cano | 2015-02-16 | 7 | -10/+10 |
| | | | | instead of "manual installation" or similar. | ||||
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-02-15 | 1 | -2/+2 |
|\ | |||||
| * | Fix wrong word in document of google oauth | Zhang Sen | 2015-02-15 | 1 | -2/+2 |
| | | |||||
* | | Update oauth documenatation with examples for omnibus package and ↵ | Marin Jankovski | 2015-02-13 | 6 | -81/+168 |
|/ | | | | installations from source. | ||||
* | Merge branch 'improve_doc' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 5 | -0/+20 |
|\ | | | | | | | | | | | Gitlab.com importer: Doc && screenshots See merge request !1520 | ||||
| * | GitLab.com importer: documentation | Valery Sizov | 2015-02-13 | 5 | -0/+20 |
| | | |||||
* | | Merge branch 'log_doc' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 2 | -0/+101 |
|\ \ | | | | | | | | | | | | | | | | Log documentation See merge request !1513 | ||||
| * | | log documentation | Valery Sizov | 2015-02-13 | 2 | -0/+101 |
| |/ | |||||
* | | Merge branch 'oauth2_doc' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 6 | -1/+33 |
|\ \ | | | | | | | | | | | | | | | | Oauth2 provider doc See merge request !1519 | ||||
| * | | OAuth2 provider documentation | Valery Sizov | 2015-02-13 | 6 | -1/+33 |
| |/ | |||||
* | | Merge branch 'add_tracker_integration_doc' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 3 | -5/+30 |
|\ \ | |/ |/| | | | | | | | | | | | Add tracker integration doc and help page on service Added documentation on how to enable tracker integration. Fix the active link on the admin page. Added help under the JIRA service page. See merge request !1508 | ||||
| * | Text changes recommended by Job. | Marin Jankovski | 2015-02-13 | 1 | -5/+5 |
| | | |||||
| * | Explained in the integration documentation how to enable external issue tracker | Marin Jankovski | 2015-02-12 | 3 | -5/+30 |
| | | |||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-02-12 | 32 | -1/+33 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #8739 from jvanbaarsen/pr/7818 | Jeroen van Baarsen | 2015-02-12 | 32 | -1/+33 |
| |\ | | | | | | | note about latest details being on master branch | ||||
| | * | note about latest details being on master branch | Ben Bodenmiller | 2015-02-05 | 32 | -1/+33 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Use gitattribute merge=union to reduce CHANGELOG merge conflicts. | Douwe Maan | 2015-02-12 | 1 | -8/+1 |
| | | | |||||
* | | | Edit group members via API | Vinnie Okada | 2015-02-11 | 1 | -0/+14 |
|/ / | | | | | | | | | Add an API endpoint to update the access level of an existing group member. | ||||
* | | Merge pull request #8778 from al3x-edge/fix-emoji-link | Sytse Sijbrandij | 2015-02-11 | 1 | -2/+2 |
|\ \ | | | | | | | Update Emoji Cheat Sheet Link | ||||
| * | | Change emoji cheat sheet link to Amazon S3 | Alexander Ambrose | 2015-02-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | The emoji cheat sheet link was changed. Commit changes the url to the updated link and fixes issue #8554. | ||||
* | | | Fix two broken links in the installation section. | Ewan Edwards | 2015-02-11 | 1 | -2/+4 |
|/ / | |||||
* | | Update patch release document | Dmitriy Zaporozhets | 2015-02-09 | 1 | -5/+5 |
| | | |||||
* | | Update GitLab.com when packages are done. No need to wait 2 days for it | Dmitriy Zaporozhets | 2015-02-09 | 1 | -4/+1 |
| | | |||||
* | | Extract update guide to separate doc to prevent mess | Dmitriy Zaporozhets | 2015-02-09 | 2 | -53/+56 |
| | | |||||
* | | Merge pull request #8620 from namnatulco/master | Jeroen van Baarsen | 2015-02-09 | 1 | -0/+2 |
|\ \ | | | | | | | Added a note saying inline HTML is disabled by default | ||||
| * | | Added a note saying inline HTML is disabled by default | Rens van der Heijden | 2015-01-21 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'webhooks-and-internal-services' into 'master' | Sytse Sijbrandij | 2015-02-07 | 2 | -0/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add doc on "Web Hooks and insecure internal web services". See #1971. See merge request !1485 | ||||
| * | | | Add doc on "Web Hooks and insecure internal web services". | Douwe Maan | 2015-02-07 | 2 | -0/+14 |
| | | | | |||||
* | | | | Merge branch 'mention-groups' | Dmitriy Zaporozhets | 2015-02-06 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG | ||||
| * | | | | Allow groups to be mentioned. | Douwe Maan | 2015-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Resolves #1673. | ||||
* | | | | | Merge branch 'api-default-order' into 'master' | Dmitriy Zaporozhets | 2015-02-06 | 3 | -5/+25 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting refactoring * refactor sorting logic for web UI * refactor and document ordering for API: project, issues, merge requests * explicitly define ordering in models using default_scope See merge request !1476 | ||||
| * | | | | Refactor and improve sorting objects in API for projects, issues and merge ↵ | Dmitriy Zaporozhets | 2015-02-05 | 3 | -5/+25 |
| | | | | | | | | | | | | | | | | | | | | requests | ||||
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Valery Sizov | 2015-02-05 | 1 | -2/+5 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #8318 from bbodenmiller/patch-9 | Jeroen van Baarsen | 2015-02-05 | 1 | -2/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | add editor command to update database.yml; cleanup | ||||
| | * | | | add editor command to update database.yml; cleanup | Ben Bodenmiller | 2014-11-23 | 1 | -2/+5 |
| | | | | | |||||
* | | | | | GitLab.com integration: refactoring | Valery Sizov | 2015-02-05 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | GitLab integration. Importer | Valery Sizov | 2015-02-05 | 1 | -0/+54 |
|/ / / / | |||||
* | | | | Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint | Dmitriy Zaporozhets | 2015-02-04 | 1 | -0/+70 |
|\ \ \ \ | | | | | | | | | | | Added a way to retrieve MR files | ||||
| * | | | | Added a way to retrieve MR files | Jeroen van Baarsen | 2015-02-04 | 1 | -0/+70 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
* | | | | | Merge branch 'consolidate_ssh_docs' into 'master' | Marin Jankovski | 2015-02-04 | 31 | -121/+143 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate SSH docs The two available SSH topics were quite short, so it made sense to combine them. Includes fixes a few missing words, punctuation. See merge request !328 | ||||
| * | | | | Consolidate the SSH topics into a single file, since the two | Ewan Edwards | 2015-02-04 | 3 | -49/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available topics are quite short. Also correct some missing words, punctuation. | ||||
| * | | | | Fix a number of discovered typos, capitalization of developer and | Ewan Edwards | 2015-02-03 | 28 | -72/+72 |
| | | | | | | | | | | | | | | | | | | | | product names, plus a couple of instances of bad Markdown markup. | ||||
* | | | | | Merge branch 'doc_cookbook_uses_omnibus' into 'master' | Marin Jankovski | 2015-02-04 | 5 | -17/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop comments on cookbook installing from source now that it uses Omnibus. gitlab-coockbook now uses Omnibus packages so raketasks are invoked via gitlab-rake See merge request !318 | ||||
| * | | | | | Drop comments on cookbook installing from source now that it uses Omnibus. | Achilleas Pipinellis | 2015-01-28 | 5 | -17/+17 |
| | | | | | | |||||
* | | | | | | Merge branch 'add_more_maintenance_tasks' into 'master' | Dmitriy Zaporozhets | 2015-02-04 | 1 | -22/+52 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more maintenance tasks to documentation See merge request !317 | ||||
| * | | | | | | Add assets precompile and redis clear cache to maintenance tasks. | Achilleas Pipinellis | 2015-01-28 | 1 | -22/+52 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' into 'master' | Sytse Sijbrandij | 2015-02-03 | 10 | -23/+23 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix capitalization of URL. A targeted fix in the documentation. See merge request !323 |