Commit Graph
1753 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets e480e45a8b Merge branch 'doc-omnibus-differences' into 'master'
Document fun facts about omnibus-gitlab

I hope this helps developers understand some of the differences.

See merge request !1546
2015-02-19 19:02:50 +00:00
Jeroen van Baarsen cbf6b6871e Merge pull request #8802 from Bugagazavr/patch-1
Update API branches documentation [ci skip]
2015-02-19 13:04:24 +01:00
Jacob Vosmaer 93e42f690b Document fun facts about omnibus-gitlab 2015-02-19 11:20:58 +01:00
Dmitriy Zaporozhets a3d039259e Fix broken links in documentation 2015-02-18 22:07:09 -08:00
Dmitriy Zaporozhets ff70d2f24e Improve GitLab.com integration documentation 2015-02-18 22:06:49 -08:00
Sytse Sijbrandij 10e4e2110c Improve the explanation and linking of the Oauth docs. 2015-02-18 20:49:19 -08:00
Dmitriy Zaporozhets 24d939afb9 Remove Group#owner_id from API since it is not used any more 2015-02-17 16:23:44 -08:00
Marin Jankovski b6a678ef43 Use correct shell version in update doc. 2015-02-16 20:27:58 -08:00
Patricio Cano d11c64a67f Updated the installation and update guides 2015-02-16 17:51:29 -08:00
Patricio Cano 2df8a91c82 Rephrased wording in the documentation to say "installation from source" instead of "manual installation" or similar. 2015-02-16 09:10:07 -08:00
Dmitriy Zaporozhets 26d594f2dd Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-15 19:00:53 -08:00
Bugagazavr 3ab07b8aae Update API branches documentation [ci skip] 2015-02-15 17:18:13 +03:00
Zhang Sen ebd00cc7f0 Fix wrong word in document of google oauth 2015-02-15 18:24:00 +08:00
Marin Jankovski d76c5824bc Update oauth documenatation with examples for omnibus package and installations from source. 2015-02-13 14:49:19 -08:00
Dmitriy Zaporozhets d0f045eb86 Merge branch 'improve_doc' into 'master'
Gitlab.com importer: Doc && screenshots

See merge request !1520
2015-02-13 18:35:15 +00:00
Valery Sizov 78124d9783 GitLab.com importer: documentation 2015-02-13 20:19:16 +02:00
Dmitriy Zaporozhets 6d523db7f6 Merge branch 'log_doc' into 'master'
Log documentation

See merge request !1513
2015-02-13 18:06:56 +00:00
Dmitriy Zaporozhets 1b81b29431 Merge branch 'oauth2_doc' into 'master'
Oauth2 provider doc

See merge request !1519
2015-02-13 18:00:57 +00:00
Dmitriy Zaporozhets b8cc501c3e Merge branch 'add_tracker_integration_doc' into 'master'
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
2015-02-13 17:57:39 +00:00
Valery Sizov d9b32f20c6 OAuth2 provider documentation 2015-02-13 19:27:50 +02:00
Marin Jankovski 01c6806f80 Text changes recommended by Job. 2015-02-13 08:56:25 -08:00
Valery Sizov 25ff20677e log documentation 2015-02-13 15:05:37 +02:00
Marin Jankovski eccf695640 Explained in the integration documentation how to enable external issue tracker 2015-02-12 17:06:55 -08:00
Dmitriy Zaporozhets 2be3a012ff Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-12 14:43:02 -08:00
Douwe Maan 4377ba1c36 Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00
Jeroen van Baarsen b92a6f7c24 Merge pull request #8739 from jvanbaarsen/pr/7818
note about latest details being on master branch
2015-02-12 11:25:40 +01:00
Vinnie Okada b0dacc8eb0 Edit group members via API
Add an API endpoint to update the access level of an existing group
member.
2015-02-11 18:53:07 -07:00
Sytse Sijbrandij 0a97b1b1a7 Merge pull request #8778 from al3x-edge/fix-emoji-link
Update Emoji Cheat Sheet Link
2015-02-11 17:04:38 -08:00
Alexander AmbroseandAlexander Ambrose e8335a65e3 Change emoji cheat sheet link to Amazon S3
The emoji cheat sheet link was changed. Commit changes the url to the
updated link and fixes issue #8554.
2015-02-11 20:02:24 -05:00
Ewan Edwards 93bd185efe Fix two broken links in the installation section. 2015-02-11 08:49:37 -08:00
Dmitriy Zaporozhets 43890ed1dc Update patch release document 2015-02-09 10:46:38 -08:00
Dmitriy Zaporozhets 026494029e Update GitLab.com when packages are done. No need to wait 2 days for it 2015-02-09 10:32:56 -08:00
Dmitriy Zaporozhets c93f4662d8 Extract update guide to separate doc to prevent mess 2015-02-09 10:30:06 -08:00
Jeroen van Baarsen dc365a1d20 Merge pull request #8620 from namnatulco/master
Added a note saying inline HTML is disabled by default
2015-02-09 11:52:28 +01:00
Sytse Sijbrandij d3c2253c6d Merge branch 'webhooks-and-internal-services' into 'master'
Add doc on "Web Hooks and insecure internal web services".

See #1971.

See merge request !1485
2015-02-07 01:15:09 +00:00
Douwe Maan 4ed70669ad Add doc on "Web Hooks and insecure internal web services". 2015-02-07 01:54:45 +01:00
Dmitriy Zaporozhets 89f8020fe1 Merge branch 'mention-groups'
Conflicts:
	CHANGELOG
2015-02-06 16:45:37 -08:00
Dmitriy Zaporozhets dd8dd92e50 Merge branch 'api-default-order' into 'master'
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
2015-02-06 18:08:44 +00:00
Dmitriy Zaporozhets bdfb349ff7 Refactor and improve sorting objects in API for projects, issues and merge requests 2015-02-05 22:00:54 -08:00
Valery Sizov 411bf8ca08 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-05 18:06:00 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Ben BodenmillerandJeroen van Baarsen f73cb6ff74 note about latest details being on master branch
[ci skip]
2015-02-05 20:41:18 +01:00
Jeroen van Baarsen eb39022674 Merge pull request #8318 from bbodenmiller/patch-9
add editor command to update database.yml; cleanup
2015-02-05 20:05:30 +01:00
Douwe Maan 9910b7ff99 Allow groups to be mentioned.
Resolves #1673.
2015-02-05 19:10:52 +01:00
Dmitriy Zaporozhets fc13ea7137 Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint
Added a way to retrieve MR files
2015-02-04 14:46:54 -08:00
Marin Jankovski d685d45222 Merge branch 'consolidate_ssh_docs' into 'master'
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
2015-02-04 17:11:38 +00:00
Ewan Edwards 7aa3f6053e Consolidate the SSH topics into a single file, since the two
available topics are quite short.

Also correct some missing words, punctuation.
2015-02-04 08:23:24 -08:00
Jeroen van Baarsen b60d06eb2c Added a way to retrieve MR files
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-04 10:24:25 +01:00
Marin Jankovski 56a456b43d Merge branch 'doc_cookbook_uses_omnibus' into 'master'
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
2015-02-04 05:28:10 +00:00