summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-041-0/+1
|\
| * Link to admin raketaskSytse Sijbrandij2015-08-031-0/+1
| |
* | Merge branch 'add-user' into 'master' Job van der Voort2015-08-047-0/+29
|\ \ | |/ |/| | | | | | | | | 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
| * typokaren Carias2015-08-031-1/+1
| |
| * text fixedkaren Carias2015-08-032-8/+8
| |
| * typokaren Carias2015-07-302-9/+9
| |
| * added new doc about adding users and memberskaren Carias2015-07-307-0/+29
| |
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-033-11/+141
|\ \
| * \ Merge branch 'master' into api-useremailsDouwe Maan2015-07-312-11/+9
| |\ \
| | * \ Merge branch 'typo-corrections' into 'master'Stan Hu2015-07-301-4/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor styling fixes - Link to rendered html instead of markdown source. - Removed typos See merge request !1044
| | | * | Minor styling fixes.Arno Fleming2015-07-251-4/+4
| | | | | | | | | | | | | | | | | | | | - Link to rendered html instead of markdown source. - Removed typos
| | * | | Updated Twitter OmniAuth documentationRaphaël Doursenaud2015-07-291-7/+5
| | | | |
| * | | | Fix docsDouwe Maan2015-07-301-6/+6
| | | | |
| * | | | Add ability to manage user email addresses via the API.Douwe Maan2015-07-291-0/+132
| |/ / /
* | | | small changeskaren Carias2015-07-318-9/+9
| | | |
* | | | added imagekaren Carias2015-07-302-2/+3
| | | |
* | | | added new doc about creating MRkaren Carias2015-07-302-0/+43
| |_|/ |/| |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-298-36/+45
|\ \ \ | |/ / | | | | | | backup-archive-permissions
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceValery Sizov2015-07-295-34/+7
| |\ \ | | |/
| | * Add "Manage merge requests" permission to docsRobert Speicher2015-07-241-0/+1
| | |
| | * Merge branch 'auth-icons-labels' into 'master' Valery Sizov2015-07-241-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-231-1/+1
| | | |
| | * | Clarify some things in monthly.mdSytse Sijbrandij2015-07-231-5/+5
| | | |
| | * | Remove docs and rake task for gmail actions to prevent problems with ↵changes_for_gmail_inbox_actionsMarin Jankovski2015-07-222-28/+0
| | |/ | | | | | | | | | registration.
| * | Merge branch 'add-file' into 'master' Job van der Voort2015-07-282-1/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | New document in GitLab Basics about adding new files See merge request !1913
| | * | fixed details in documentkaren Carias2015-07-271-2/+2
| | | |
| | * | added new document about adding new fileskaren Carias2015-07-232-1/+34
| | |/
| * | Merge branch 'doc-size' into 'master' Job van der Voort2015-07-281-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Added info about repo size Because of tweet https://twitter.com/s_hulard/status/624160758335672320 See merge request !1912
| | * | fixed textkaren Carias2015-07-271-1/+2
| | | |
| | * | added info about repo sizekaren Carias2015-07-231-1/+3
| | |/
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-2730-113/+488
|\ \ \ | |/ / | | | | | | backup-archive-permissions
| * | added note about unique SSH keyskaren Carias2015-07-241-0/+3
| | |
| * | added note about labels in MRkaren Carias2015-07-231-1/+3
| |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-07-222-2/+38
| |\
| | * You need to store your DB encryption keydocument-2fa-backupJacob Vosmaer2015-07-212-2/+38
| | |
| * | fixed imagekaren Carias2015-07-211-1/+1
| | |
| * | added Fork Project documentkaren Carias2015-07-213-1/+23
| |/
| * The release manager owns the stable branchesJacob Vosmaer2015-07-171-0/+1
| | | | | | | | | | I think this helps the release manager because it means they don't have to worry about others pushing commits at the last minute.
| * fixed conflictkaren Carias2015-07-169-35/+159
| |\
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-07-161-2/+5
| | |\
| | | * Merge branch 'merge-request-wip-information' into 'master'Stan Hu2015-07-151-2/+5
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | api: expose work_in_progress flag See merge request !948
| | | | * api: expose work_in_progress flagBen Boeckel2015-07-101-2/+5
| | | | |
| | * | | Merge pull request #9455 from rburchell/patch-1Stan Hu2015-07-141-8/+0
| | |\ \ \ | | | |/ / | | |/| | Remove author information from "post" in merge_requests API.
| | | * | Remove author information from "post" in merge_requests API.Robin Burchell2015-07-131-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | From both experimenting with the API and reading the source code, this appears to not be used at all. My guess is this was copypasta from somewhere else.
| | * | | Revert "Change default admin password from "5iveL!fe" to "password""Sytse Sijbrandij2015-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 8a01a1222875b190d32769f7a6e7a74720079d2a.
| | * | | Merge branch 'notifications-title' into 'master' Job van der Voort2015-07-142-5/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | fixed notifications titlekaren Carias2015-07-132-5/+3
| | | |/ /
| | * | | Merge branch 'fix-ed' into 'master' Dmitriy Zaporozhets2015-07-141-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix path to move_drop_indexes.ed Small documentation fix. See merge request !1900
| | | * | | Fix path to move_drop_indexes.edJacob Vosmaer2015-07-141-1/+1
| | | | | |
| | * | | | create update guides for 7.13Job van der Voort2015-07-142-11/+140
| | |/ / /
View Lorry Controller Status