88ae5a9b20
fixed terminology
2015-08-03 15:36:26 -07:00
8ec7025a5d
Link to admin raketask
2015-08-03 11:33:48 +00:00
b118f648cb
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-03 11:04:04 +02:00
4f9d32eab0
typo
2015-08-02 09:54:42 -07:00
8e53bae700
New doc about how to add an image in GitLab Basics
2015-08-02 09:52:30 -07:00
e72e721f04
small changes
2015-07-31 08:21:53 -07:00
51e5f379dd
Merge branch 'master' into api-useremails
2015-07-31 14:34:53 +02:00
89fc87122f
added image
2015-07-30 13:54:37 -07:00
2911b71e82
added new doc about creating MR
2015-07-30 13:50:15 -07:00
e70901abe7
typo
2015-07-30 13:26:10 -07:00
168f10feba
added new doc about adding users and members
2015-07-30 13:20:10 -07:00
1c7a8b8c27
Fix docs
2015-07-30 11:41:59 +02:00
70410fb6bc
fixed typo in backup_restore.md
2015-07-30 08:23:11 +00:00
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
725a891dda
Updated Twitter OmniAuth documentation
2015-07-29 23:27:04 +00:00
05b518aa4d
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
2015-07-29 15:44:04 +02:00
4fb6ddfe06
Add ability to manage user email addresses via the API.
2015-07-29 15:40:08 +02:00
81c71d2519
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-07-29 12:19:37 +03:00
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
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
6b243dd138
fixed text
2015-07-27 21:53:55 -07:00
d61433542e
fixed details in document
2015-07-27 16:46:30 -07:00
0be6debb0b
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
2015-07-27 11:22:35 +02:00
779318398c
Minor styling fixes.
...
- Link to rendered html instead of markdown source.
- Removed typos
2015-07-25 18:43:58 +02:00
f8471cd187
added note about unique SSH keys
2015-07-24 18:05:52 -07:00
b5e6ffa616
Add "Manage merge requests" permission to docs
2015-07-24 14:59:02 -04:00
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.
See merge request !927
2015-07-24 11:28:55 +00:00
50b36c0ae7
added new document about adding new files
2015-07-23 17:11:17 -07:00
a1ca9b5220
added info about repo size
2015-07-23 16:38:22 -07:00
9a7645c8a4
added note about labels in MR
2015-07-23 12:30:05 -07:00
f6ba8c41e2
Clarify some things in monthly.md
2015-07-23 14:47:15 +00:00
70a3c165a9
Allow custom label to be set for authentication providers.
2015-07-23 15:20:12 +02:00
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
ca451365ab
Remove docs and rake task for gmail actions to prevent problems with registration.
2015-07-22 11:46:08 +02:00
39dc39e335
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-07-22 09:56:43 +02:00
afc8e92223
fixed image
2015-07-21 15:47:17 -07:00
42130a97e9
added Fork Project document
2015-07-21 15:45:12 -07:00
96819d2fb4
You need to store your DB encryption key
2015-07-21 14:35:58 +02:00
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
70a08acedf
fixed conflict
2015-07-16 11:25:12 -07:00
53d40b8ab1
changed some text
2015-07-16 11:18:10 -07:00
66bdbdb35d
Remove satellites mention from architecture doc
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 17:57:46 +02:00
9b6f1c5948
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-07-16 12:11:25 +02:00
a87989fb7d
Remove satellites
2015-07-15 15:45:57 +02:00
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
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
b3ab0e4efb
Revert "Change default admin password from "5iveL!fe" to "password""
...
This reverts commit 8a01a12228
2015-07-14 17:59:36 +02:00
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
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
e26e46db2c
Fix path to move_drop_indexes.ed
2015-07-14 11:50:01 +02:00
80afd4c594
create update guides for 7.13
2015-07-14 11:49:53 +02:00
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
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:
cc @JobV @jacobvosmaer @marin @sytses
See merge request !970
2015-07-14 08:30:46 +00:00
3020fa9945
added link to doc
2015-07-13 12:44:50 -07:00
3d6e67e44e
fixed notifications title
2015-07-13 10:36:29 -07:00
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
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
9ba0079c51
Add 'ed' step to mysql-to-postgres procedure
...
Introduced in
b2d1599706
2015-07-13 18:14:26 +02:00
31565d7890
Revert "added link to issue closing pattern in doc"
...
This reverts commit 903daedb5a
2015-07-13 12:36:53 +02:00
10e8fd46b1
fixed info in doc
2015-07-10 16:09:52 -07:00
903daedb5a
added link to issue closing pattern in doc
2015-07-10 12:54:02 -07:00
414cacd7f4
api: expose work_in_progress flag
2015-07-10 10:33:43 -04:00
13bf844a1e
Revert "use relative link to SSH setup page"
...
This reverts commit f876ef6e4d
2015-07-09 22:50:05 -07:00
ec72aaeae7
added new doc about creating a new branch
2015-07-09 15:33:42 -07:00
4c586dc7c2
Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries"
...
This reverts commit dd4fee5fdb
2015-07-09 12:35:53 -07:00
dd4fee5fdb
api: add 'system', 'upvote', and 'downvote' fields to note queries
2015-07-09 11:24:28 -04:00
512bb5ba28
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-07-08 23:30:37 +02:00
b2246ed175
Make sure webhooks are mentioned at the top level.
2015-07-08 22:27:36 +02:00
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
0c4d923cad
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-07-08 11:20:14 +02:00
deb487ec1f
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-07-08 11:06:17 +02:00
854679cb80
Merge branch 'fix-irker-capitalization' into 'master'
...
Change "Irc Uri" -> "IRC URI"
See merge request !937
2015-07-08 06:52:28 +00:00
8b1065019a
Merge branch 'create-group' into 'master'
...
New doc about creating groups
I added a new document about creating groups in GitLab.
I also fixed comment in previous MR https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1885
See merge request !1886
2015-07-07 20:14:07 +00:00
cddbbc819c
fixed text
2015-07-07 12:49:58 -07:00
75e33e23d1
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
...
Conflicts:
doc/install/requirements.md
2015-07-07 18:23:11 +02:00
540656f9ec
Specify that swap will be slow.
2015-07-07 18:20:43 +02:00
ddb1836f93
Added info about common UI problems if IE Compatibility View mode is enabled.
2015-07-07 11:08:29 -05:00
943217a122
fixed typo
2015-07-07 07:09:37 -07:00
afe5069551
fixed image
2015-07-07 07:06:02 -07:00
bf0b3fcb89
fixed document with improved instructions
2015-07-07 06:58:42 -07:00
954eedf368
Change "Irc Uri" -> "IRC URI"
2015-07-07 05:48:32 -07:00
5f4ec60024
Merge pull request #9435 from bbodenmiller/patch-1
...
use relative link to SSH setup page
2015-07-07 05:44:06 -07:00
d8c9d94817
Add link to multiple app servers.
2015-07-07 12:00:48 +00:00
474d798c42
Merge branch 'compress-db' into 'master'
...
Compress database backup
Restore handles both cases: uncompressed and compressed backup. As an improvement `IO.popen` can be used.
/cc @jacobvosmaer
See merge request !873
2015-07-07 10:58:27 +00:00
f76092c06d
Merge branch 'settings-via-api' into 'master'
...
API to set application settings for admin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !934
2015-07-07 10:57:41 +00:00
f876ef6e4d
use relative link to SSH setup page
2015-07-06 23:15:03 -07:00
bb50b7fcd0
Allow custom backup archive permissions
...
This change helps system administrators who want to replicate
GitLab backup files without needing root permissions.
2015-07-06 18:43:17 +02:00
69c659ebd3
Compress database backup
2015-07-06 17:14:17 +02:00
b28714b6a9
Add docs and empty specs for applicaiton settings API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-06 15:53:08 +02:00
1165d3dce1
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-07-06 12:11:54 +02:00
5f52d6a038
Merge branch 'add-irker-options' into 'master'
...
Add Irker service configuration options
### What does this MR do?
This MR makes a number of hard-coded Irker parameters configurable in the service settings: Irker server host, port, and default IRC URI. It also removes the "max recipient" limit since the recipient list is configurable only by the project owner, and it makes no sense to update the limit when it is implied in the recipient list already.
### Why was this MR needed?
The existing service assumed that gitlab.com was running an Irker daemon on `localhost` when it was not. Using Irker on gitlab.com thus did not work at all. This MR allows users to provide their own Irker daemons.
### Are there points in the code the reviewer needs to double check?
My main concern is whether allowing a user to specify the server/port combination would have security implications for a host. Given that HipChat and Slack allow users to do this, I didn't think this was doing anything novel.
### What are the relevant issue numbers?
* Closes #1713
* Closes #1714
* Closes gitlab-com/support-forum#139
### Screenshots
### Before
### After
See merge request !930
2015-07-06 08:57:16 +00:00
a4c4e7a77e
Merge branch 'doc-list' into 'master'
...
Improve documentation of lists in Markdown
See merge request !899
2015-07-05 18:58:18 +00:00
04f5487b0d
fixed link to gitlab-basics
2015-07-05 08:23:09 -07:00
d4be82d1c9
Add Irker service configuration options
...
Closes #1713
Closes #1714
Closes gitlab-com/support-forum#139
2015-07-05 06:40:56 -07:00
b348ff1a10
Improve documentation of lists in Markdown
2015-07-03 15:27:24 -03:00
26172aeeae
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-07-03 16:17:02 +02:00
b3a751112d
Allow user to be blocked and unblocked via the API
2015-07-03 11:17:57 +00:00
fef2e24804
new doc about creating groups
2015-07-02 12:09:06 -07:00
6646a04d4c
Merge branch 'create-final-rc' into 'master'
...
Change RC/final package release timing
Creating the packages one day before the release feels strange, especially in a month like this (June 2015) where the release is on a Monday.
I think it is better to have one more RC.
See merge request !1873
2015-07-02 17:04:02 +00:00
a6a0792e9d
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-07-02 16:08:21 +02:00
karen Carias
Sytse Sijbrandij
Dmitriy Zaporozhets
Douwe Maan
Mike C
Stan Hu
Raphaël Doursenaud
Jacob Vosmaer
Valery Sizov
Job van der Voort
Arno Fleming
Robert Speicher
Valery Sizov
mchristof
Marin Jankovski
Dmitriy Zaporozhets
Job van der Voort
Robin Burchell
Ben Boeckel
Robert Schilling
Patricio Cano
Kamil Trzciński
Ben Bodenmiller
Robert Speicher
Raniere Silva
Steve Norman
