Commit Graph
2231 Commits
Author SHA1 Message Date
karen Carias 88ae5a9b20 fixed terminology 2015-08-03 15:36:26 -07:00
Sytse Sijbrandij 8ec7025a5d Link to admin raketask 2015-08-03 11:33:48 +00:00
Dmitriy Zaporozhets b118f648cb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-03 11:04:04 +02:00
karen Carias 4f9d32eab0 typo 2015-08-02 09:54:42 -07:00
karen Carias 8e53bae700 New doc about how to add an image in GitLab Basics 2015-08-02 09:52:30 -07:00
karen Carias e72e721f04 small changes 2015-07-31 08:21:53 -07:00
Douwe Maan 51e5f379dd Merge branch 'master' into api-useremails 2015-07-31 14:34:53 +02:00
karen Carias 89fc87122f added image 2015-07-30 13:54:37 -07:00
karen Carias 2911b71e82 added new doc about creating MR 2015-07-30 13:50:15 -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
Douwe Maan 1c7a8b8c27 Fix docs 2015-07-30 11:41:59 +02:00
Mike C 70410fb6bc fixed typo in backup_restore.md 2015-07-30 08:23:11 +00: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
Raphaël Doursenaud 725a891dda Updated Twitter OmniAuth documentation 2015-07-29 23:27:04 +00:00
Jacob Vosmaer 05b518aa4d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-29 15:44:04 +02:00
Douwe Maan 4fb6ddfe06 Add ability to manage user email addresses via the API. 2015-07-29 15:40:08 +02:00
Valery Sizov 81c71d2519 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-29 12:19:37 +03:00
Job van der Voort 5efb58b09a Merge branch 'add-file' into 'master'
New document in GitLab Basics about adding new files



See merge request !1913
2015-07-28 13:43:30 +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
karen Carias d61433542e fixed details in document 2015-07-27 16:46:30 -07:00
Jacob Vosmaer 0be6debb0b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-27 11:22:35 +02: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 f8471cd187 added note about unique SSH keys 2015-07-24 18:05:52 -07:00
Robert Speicher b5e6ffa616 Add "Manage merge requests" permission to docs 2015-07-24 14:59:02 -04:00
Valery Sizov 70de5114fb Merge branch 'auth-icons-labels' into 'master'
Allow custom label to be set for authentication providers.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341

Beside the above, I've:
- Refactored `OauthHelper` to have clearer method names and behaviour
- Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider`
- Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth
- Updated the icons for GitHub and GitLab

In the examples below, "OurAuth" is a SAML provider with a custom label.

![Screen_Shot_2015-07-02_at_16.29.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d425bde69dc34e1667ebd5375d0266d/Screen_Shot_2015-07-02_at_16.29.52.png)

![Screen_Shot_2015-07-02_at_16.31.40](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cbb273321ecdf4cab3d3ef0dc35553e7/Screen_Shot_2015-07-02_at_16.31.40.png)

![Screen_Shot_2015-07-02_at_16.32.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d8dd6e1d0dc45a788e869cdcdc99e178/Screen_Shot_2015-07-02_at_16.32.39.png)

![Screen_Shot_2015-07-02_at_16.33.18](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7dbfe8b0ae229c32a08d6c7442976d83/Screen_Shot_2015-07-02_at_16.33.18.png)


See merge request !927
2015-07-24 11:28:55 +00:00
karen Carias 50b36c0ae7 added new document about adding new files 2015-07-23 17:11:17 -07: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
Sytse Sijbrandij f6ba8c41e2 Clarify some things in monthly.md 2015-07-23 14:47:15 +00:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
mchristof 8279d93680 updated restore docs wrt backup location [ci skip]
Made sure to point out that the restore location can be overwritten by
an entry in the config.
2015-07-23 09:47:32 +01:00
Marin Jankovski ca451365ab Remove docs and rake task for gmail actions to prevent problems with registration. 2015-07-22 11:46:08 +02:00
Marin Jankovski 39dc39e335 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-22 09:56:43 +02:00
karen Carias afc8e92223 fixed image 2015-07-21 15:47:17 -07:00
karen Carias 42130a97e9 added Fork Project document 2015-07-21 15:45:12 -07:00
Jacob Vosmaer 96819d2fb4 You need to store your DB encryption key 2015-07-21 14:35:58 +02:00
Jacob Vosmaer 559c363b1e The release manager owns the stable branches
I think this helps the release manager because it means they don't
have to worry about others pushing commits at the last minute.
2015-07-17 16:32:06 +02:00
karen Carias 70a08acedf fixed conflict 2015-07-16 11:25:12 -07:00
karen Carias 53d40b8ab1 changed some text 2015-07-16 11:18:10 -07:00
Dmitriy Zaporozhets 66bdbdb35d Remove satellites mention from architecture doc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 17:57:46 +02:00
Marin Jankovski 9b6f1c5948 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-16 12:11:25 +02:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Stan Hu bce9315ade Merge pull request #9455 from rburchell/patch-1
Remove author information from "post" in merge_requests API.
2015-07-14 23:44:40 -07:00
Stan Hu daed441dfe Merge branch 'merge-request-wip-information' into 'master'
api: expose work_in_progress flag

See merge request !948
2015-07-15 01:13:05 +00:00
Sytse Sijbrandij b3ab0e4efb Revert "Change default admin password from "5iveL!fe" to "password""
This reverts commit 8a01a12228.
2015-07-14 17:59:36 +02:00
Job van der Voort 1da6d42bca Merge branch 'notifications-title' into 'master'
fixed notifications title

I fixed the title and link to this document because I believe that it's more clear and easier to find if it has "emails" in the name.


See merge request !1897
2015-07-14 15:24:34 +00:00
Dmitriy Zaporozhets 070d6a2452 Merge branch 'fix-ed' into 'master'
Fix path to move_drop_indexes.ed

Small documentation fix.

See merge request !1900
2015-07-14 12:08:26 +00:00
Jacob Vosmaer e26e46db2c Fix path to move_drop_indexes.ed 2015-07-14 11:50:01 +02:00