Commit Graph
2161 Commits
Author SHA1 Message Date
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
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
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
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
Marin Jankovski 9b6f1c5948 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-16 12:11:25 +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
Job van der Voort 80afd4c594 create update guides for 7.13 2015-07-14 11:49:53 +02:00
Dmitriy Zaporozhets ee53ba9f34 Merge branch 'mysql-to-postgres-ed' into 'master'
Add 'ed' step to mysql-to-postgres procedure

This change brings the documentation in this repo up to date with that in https://github.com/gitlabhq/mysql-postgresql-converter .

See merge request !1896
2015-07-14 08:52:01 +00:00
Dmitriy Zaporozhets 5c53dc5a1e Merge branch 'project-default-view' into 'master'
Allow user to specify content he wants to see on project page

Improvement to !938. Since a lot of people complain on fact they don't like to see README.
Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour.

User can specify which content he/she wants to see:

![Screenshot_2015-07-13_18.24.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d237474e8f52df4a62ba7e951fa28bd8/Screenshot_2015-07-13_18.24.31.png)

![Screenshot_2015-07-13_18.24.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/473b0e2a94b3de16d048b8332b539816/Screenshot_2015-07-13_18.24.36.png)

cc @JobV @jacobvosmaer @marin @sytses

See merge request !970
2015-07-14 08:30:46 +00:00
karen Carias 3020fa9945 added link to doc 2015-07-13 12:44:50 -07:00
karen Carias 3d6e67e44e fixed notifications title 2015-07-13 10:36:29 -07:00
Robin Burchell 6f581841d5 Remove author information from "post" in merge_requests API.
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.
2015-07-13 18:54:15 +02:00
Dmitriy Zaporozhets 5f34759ecb Allow user to specify content he wants to see on project page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-13 18:24:15 +02:00
Jacob Vosmaer 9ba0079c51 Add 'ed' step to mysql-to-postgres procedure
Introduced in
https://github.com/gitlabhq/mysql-postgresql-converter/commit/b2d1599706f532e1bac836243f25e005c816ef14
2015-07-13 18:14:26 +02:00
Sytse Sijbrandij 31565d7890 Revert "added link to issue closing pattern in doc"
This reverts commit 903daedb5a.
2015-07-13 12:36:53 +02:00
karen Carias 10e8fd46b1 fixed info in doc 2015-07-10 16:09:52 -07:00
karen Carias 903daedb5a added link to issue closing pattern in doc 2015-07-10 12:54:02 -07:00
Ben Boeckel 414cacd7f4 api: expose work_in_progress flag 2015-07-10 10:33:43 -04:00
Stan Hu 13bf844a1e Revert "use relative link to SSH setup page"
This reverts commit f876ef6e4d.
2015-07-09 22:50:05 -07:00
karen Carias ec72aaeae7 added new doc about creating a new branch 2015-07-09 15:33:42 -07:00
Stan Hu 4c586dc7c2 Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries"
This reverts commit dd4fee5fdb.
2015-07-09 12:35:53 -07:00
Ben Boeckel dd4fee5fdb api: add 'system', 'upvote', and 'downvote' fields to note queries 2015-07-09 11:24:28 -04:00
Dmitriy Zaporozhets 512bb5ba28 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-08 23:30:37 +02:00
Sytse Sijbrandij b2246ed175 Make sure webhooks are mentioned at the top level. 2015-07-08 22:27:36 +02:00
Job van der Voort ad12c1264d Merge branch 'add-ie-compat-notice' into 'master'
Added info about common UI problems if IE Compatibility View mode is enabled.

/cc @sytses @Haydn

See merge request !939
2015-07-08 09:32:23 +00:00