Commit Graph
2231 Commits
Author SHA1 Message Date
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
Jacob Vosmaer 0c4d923cad Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-07-08 11:20:14 +02:00
Jacob Vosmaer deb487ec1f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-08 11:06:17 +02:00
Robert Schilling 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
Job van der Voort 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
karen Carias cddbbc819c fixed text 2015-07-07 12:49:58 -07:00
Sytse Sijbrandij 75e33e23d1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Conflicts:
	doc/install/requirements.md
2015-07-07 18:23:11 +02:00
Sytse Sijbrandij 540656f9ec Specify that swap will be slow. 2015-07-07 18:20:43 +02:00
Patricio Cano ddb1836f93 Added info about common UI problems if IE Compatibility View mode is enabled. 2015-07-07 11:08:29 -05:00
karen Carias 943217a122 fixed typo 2015-07-07 07:09:37 -07:00
karen Carias afe5069551 fixed image 2015-07-07 07:06:02 -07:00
karen Carias bf0b3fcb89 fixed document with improved instructions 2015-07-07 06:58:42 -07:00
Stan Hu 954eedf368 Change "Irc Uri" -> "IRC URI" 2015-07-07 05:48:32 -07:00
stanhu 5f4ec60024 Merge pull request #9435 from bbodenmiller/patch-1
use relative link to SSH setup page
2015-07-07 05:44:06 -07:00
Sytse Sijbrandij d8c9d94817 Add link to multiple app servers. 2015-07-07 12:00:48 +00:00
Kamil Trzciński 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
Dmitriy Zaporozhets 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
Ben Bodenmiller f876ef6e4d use relative link to SSH setup page 2015-07-06 23:15:03 -07:00
Jacob Vosmaer 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
Kamil Trzcinski 69c659ebd3 Compress database backup 2015-07-06 17:14:17 +02:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 1165d3dce1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-06 12:11:54 +02:00
Dmitriy Zaporozhets 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

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2eb3eb815e249e9fb669fc97ecd4f3c8/image.png)

### After

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cceaba951c05bd3df2c842cc68046b87/image.png)

See merge request !930
2015-07-06 08:57:16 +00:00
Robert Speicher 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
karen Carias 04f5487b0d fixed link to gitlab-basics 2015-07-05 08:23:09 -07:00
Stan Hu d4be82d1c9 Add Irker service configuration options
Closes #1713
Closes #1714
Closes gitlab-com/support-forum#139
2015-07-05 06:40:56 -07:00
Raniere Silva b348ff1a10 Improve documentation of lists in Markdown 2015-07-03 15:27:24 -03:00
Jacob Vosmaer 26172aeeae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-03 16:17:02 +02:00
Steve Norman b3a751112d Allow user to be blocked and unblocked via the API 2015-07-03 11:17:57 +00:00
karen Carias fef2e24804 new doc about creating groups 2015-07-02 12:09:06 -07:00
Job van der Voort 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
Dmitriy Zaporozhets a6a0792e9d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-02 16:08:21 +02:00