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 Ambrose and Alexander 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 Bodenmiller and Jeroen 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
Dmitriy Zaporozhets
f1ffed2637
Merge branch 'add_more_maintenance_tasks' into 'master'
...
Add more maintenance tasks to documentation
See merge request !317
2015-02-04 04:34:07 +00:00
Ewan Edwards
ad6c372eee
Fix a number of discovered typos, capitalization of developer and
...
product names, plus a couple of instances of bad Markdown markup.
2015-02-03 15:18:40 -08:00
Sytse Sijbrandij
21b742a027
Merge branch 'master' into 'master'
...
Fix capitalization of URL.
A targeted fix in the documentation.
See merge request !323
2015-02-03 23:12:40 +00:00
Dmitriy Zaporozhets
9e5f4aec6c
Merge branch 'new-file-repo-docs' into 'master'
...
Web editor documentation
Related to #1930
See merge request !1458
2015-02-03 19:17:04 +00:00
Job van der Voort
68fbf1423f
improve english documentation
2015-02-03 11:05:20 -08:00
jubianchi
4e97f26649
Acces groups with their path in API
2015-02-03 13:42:38 +01:00
Robert Schilling
0e896aa9e9
Update gitlab-shell to 2.4.2 for 7.7 install/update guide
...
closes #8718 , closes #8721
2015-02-03 11:44:55 +01:00
Dmitriy Zaporozhets
7ba97ab4a5
Web editor documnetation
2015-02-02 16:43:51 -08:00
Job van der Voort
6496dc3cd4
Merge branch 'doc/import' into 'master'
...
Make omnibus the default in repo import docs
I hope this reads nicer for people using omnibus packages.
See merge request !1420
2015-02-03 00:22:53 +00:00
Job van der Voort
561a715308
add clear documentation on searching between groups
2015-02-02 10:00:05 -08:00
Ewan Edwards
e6e337088b
Make all non-config/non-operational mentions of URL consistently
...
capitalized.
Make the plural version consistently "URLs".
Fix an instance where the article "the" before URL was missing.
2015-01-30 10:24:45 -08:00
Jacob Vosmaer
1a1d7085fa
Mention libkrb5-dev dependency
2015-01-30 16:03:27 +01:00
Job van der Voort
5914c7e1b7
Merge branch 'ldap_defaults' into 'master'
...
Saner LDAP defaults
I have the impression that most people use LDAP servers listening
on port 389, without encryption. If we make that the default we
give people a smoother ride setting up GitLab.
See merge request !1446
2015-01-28 18:24:30 +00:00