Commit Graph
126 Commits
Author SHA1 Message Date
Job van der Voort 7bcce28df6 Merge branch 'fix' into 'master'
Fixed text about HTTP

Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840

See merge request !1921
2015-08-26 11:16:13 +00:00
karen Carias 10491b5438 deleted line 2015-08-17 14:42:34 -07:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets c0bf026ed8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-11 14:29:43 +02:00
Dmitriy Zaporozhets 84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' "
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
2015-08-11 10:26:19 +02:00
karen Carias 5ba2d53cfa fixed text 2015-08-10 16:56:02 -07:00
karen Carias e0642b2743 fixed conflict 2015-08-10 16:14:03 -07:00
karen Carias 37b4cfea3a fixed conflict and comment 2015-08-10 16:05:59 -07:00
karen Carias 8344c79508 fixed conflict and comment 2015-08-10 16:03:10 -07:00
Robert Speicher a71bed53e0 Merge branch 'merge-notifs' into 'master'
See merge request !1077
2015-08-07 18:47:02 -04:00
karen Carias 082467e8e6 Info about not receiving emails 2015-08-07 13:07:04 -07:00
Dmitriy Zaporozhets 3c5ef17975 Link merge request doc to README
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 13:07:03 +02:00
Dmitriy Zaporozhets 86bccb71a1 Create ref for every merge request. Add documentation for fetch merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:54:58 +02:00
Douwe Maan 4f24eb2aa6 Merge branch 'master' into merge-notifs 2015-08-06 12:16:36 +02:00
Douwe Maan c6799b0e1e Update notification docs 2015-08-06 12:16:05 +02:00
Job van der Voort e9ba1185f2 Merge branch 'add-user' into 'master'
Added new doc about adding users and members

Added new doc in workflow about how to add users and members and I also linked it to "permissions".

See merge request !1916
2015-08-04 08:46:47 +00:00
karen Carias c5a6c16dba typo 2015-08-03 15:55:02 -07:00
karen Carias 28cc6d9b98 text fixed 2015-08-03 15:51:09 -07:00
karen Carias e70901abe7 typo 2015-07-30 13:26:10 -07:00
karen Carias 168f10feba added new doc about adding users and members 2015-07-30 13:20:10 -07:00
Stan Hu 6b5551d994 Merge branch 'typo-corrections' into 'master'
Minor styling fixes

- Link to rendered html instead of markdown source.
- Removed typos

See merge request !1044
2015-07-30 06:39:12 +00:00
Job van der Voort 2f5359233d Merge branch 'doc-size' into 'master'
Added info about repo size

Because of tweet https://twitter.com/s_hulard/status/624160758335672320

See merge request !1912
2015-07-28 13:40:19 +00:00
karen Carias 6b243dd138 fixed text 2015-07-27 21:53:55 -07:00
Arno Fleming 779318398c Minor styling fixes.
- Link to rendered html instead of markdown source.
- Removed typos
2015-07-25 18:43:58 +02:00
karen Carias a1ca9b5220 added info about repo size 2015-07-23 16:38:22 -07:00
karen Carias 9a7645c8a4 added note about labels in MR 2015-07-23 12:30:05 -07:00
karen Carias 3d6e67e44e fixed notifications title 2015-07-13 10:36:29 -07:00
karen Carias c7f89e9ceb fixed phrase 2015-06-25 16:29:49 -07:00
karen Carias b7930718a3 added info about EE 2015-06-25 11:43:41 -07:00
karen Carias 8045d67376 added info about GitHub importing 2015-06-24 14:57:46 -07:00
Karen Carias bdab1c6c46 added info about migrating to gitlab.com 2015-06-17 01:02:01 +00:00
Robert Speicher cdf893bc15 Move 2FA docs from "Workflow" to "Profile Settings" 2015-06-13 17:59:12 -04:00
Dmitriy Zaporozhets 148178fb98 Merge branch 'rs-issue-1758' into 'master'
Update grids for 2FA details

Also adds a link to the documentation.

Closes #1758

See merge request !795
2015-06-11 15:00:08 +00:00
Job van der Voort 7872c7ff62 fix and minify images 2015-06-11 15:12:47 +02:00
Job van der Voort 9a4886f0a0 move and fix links importing docs 2015-06-11 14:45:48 +02:00
Robert Speicher fbdcaebcd1 Fix "Acount" typo in 2FA docs
[ci skip]
2015-06-10 17:11:04 -04:00
Karen Carias fd9849ebba fixed links 2015-06-10 03:19:40 +00:00
Karen Carias b4116e76cb Removed link "importing to gitlab" because it's in "Documentation". Organized links in alphabetical order. 2015-06-08 20:55:42 +00:00
Karen Carias 44aaf40ad3 fixed numbers 2015-06-08 20:37:28 +00:00
Karen Carias 0c538cd8b5 fixed numbers 2015-06-08 20:36:28 +00:00
Karen Carias fc9d90c379 fixed numbers 2015-06-08 20:35:53 +00:00
Karen Carias e150ab9cee Added info about milestones and wiki pages not imported from Bitbucket 2015-06-08 20:31:02 +00:00
Karen Carias ce7831ae39 fixed importing link 2015-06-08 20:26:58 +00:00
Job van der Voort b368d4a1d1 fix spacing in document 2015-06-08 16:37:04 +02:00
Job van der Voort 8a32c46e6e importing documents renewed 2015-06-08 16:35:03 +02:00
Sytse Sijbrandij 509fe1159a Merge branch 'master' into 'master'
Doc: Added FreeOTP to 2FA

I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.

See merge request !777
2015-06-06 13:11:01 +00:00
rugk 975d110688 Changed spelling 2015-06-06 12:34:40 +00:00
rugk 507ebb701a Escaped(?) 2015-06-05 13:18:05 +00:00
rugk 193f019f61 Added free alternative to Google Authenticator (FreeOTP). 2015-06-05 13:16:47 +00:00
Douwe Maan bdfd163aa1 Add info about WIP merge requests to docs. 2015-06-05 13:12:55 +02:00