Commit Graph
2091 Commits
Author SHA1 Message Date
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
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
karen Carias 7381a1ab5e fixed link 2015-07-01 20:26:52 -07:00
karen Carias 23ba7c2024 new document about creating a project 2015-07-01 20:23:31 -07:00
Douwe Maan 9e841cf1a8 Add Troubleshooting section to SAML doc. 2015-07-01 14:25:22 +02:00
Dmitriy Zaporozhets 15743123c9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-01 11:21:40 +02:00
Job van der Voort 36ecc6d305 Merge branch 'commandline' into 'master'
added new doc "command line commands"

Added new doc to GitLab Basics

See merge request !1880
2015-07-01 08:28:08 +00:00
karen Carias e0e8985855 small fixes 2015-06-30 12:49:51 -07:00
karen Carias 7b7dd96b7d organized commands 2015-06-30 12:45:21 -07:00
karen Carias af93e043da fixed typo 2015-06-30 09:10:27 -07:00
karen Carias fddeb0184c added new links 2015-06-30 09:03:10 -07:00
karen Carias 1c9cca5e06 renamed files with hyphen 2015-06-30 08:57:17 -07:00
Dmitriy Zaporozhets a5b54f919a Reporter role can manage issue tracker now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 13:33:02 +02:00
karen Carias 437ecdf2b0 fixed title 2015-06-29 19:03:17 -07:00
karen Carias 5f38703bdc split to 2 documents 2015-06-29 18:53:51 -07:00
Dmitriy Zaporozhets 8e6efc5e75 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-29 15:38:23 +02:00
Jacob Vosmaer 3c01ab10fe Link to SAML docs from doc index
Without this link, the SAML docs are hard to discover.
2015-06-29 11:32:40 +02:00
Marin Jankovski 83c2abc4e6 Add a troubleshooting section for backup restore docs, explain about warnings when using omnibus packages. 2015-06-29 09:42:09 +02:00
Job van der Voort d3e040c719 Merge branch 'k-github-ee' into 'master'
added info about GitHub importing

Added info that importing doc also works for GitHub EE.

https://dev.gitlab.org/gitlab/gitlabhq/issues/2410#note_49396

See merge request !1878
2015-06-26 09:08:34 +00:00
karen Carias e8e6bb09a2 fixed clone words 2015-06-25 16:44:31 -07:00
karen Carias c7f89e9ceb fixed phrase 2015-06-25 16:29:49 -07:00
karen Carias b7930718a3 added info about EE 2015-06-25 11:43:41 -07:00
karen Carias 047c074a15 added new doc command line commands
git status
2015-06-25 08:45:37 -07:00
Robert Speicher 8a01a12228 Change default admin password from "5iveL!fe" to "password" 2015-06-24 18:42:34 -04:00
karen Carias 8045d67376 added info about GitHub importing 2015-06-24 14:57:46 -07:00
Robert Speicher d2de219f6c Merge branch 'add-2fa-status-to-admin-api' into 'master'
Add 2FA status to user admin API

This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA.

See merge request !881
2015-06-24 19:24:20 +00:00
Stan Hu 6548e9b48c Add 2FA status to user admin API
Closes https://github.com/gitlabhq/gitlabhq/issues/9391
2015-06-23 22:41:59 -07:00
Job van der Voort d3d92cd155 Merge branch 'create_ssh' into 'master'
Create SSH keys document

@job I created the next document for your review, which is "Creating your SSH Keys"

Thanks!

See merge request !1875
2015-06-23 18:29:10 +00:00
karen Carias fe44adb73c added final phrase in doc 2015-06-23 11:27:08 -07:00
karen Carias 2cf9baecfb added requested changes 2015-06-23 11:20:20 -07:00
karen Carias d5e6367a0f added link to GitLab Basics 2015-06-23 10:43:51 -07:00
karen Carias 707864a4f3 added images to doc 2015-06-22 09:00:38 -07:00
karen Carias 1b82bd27ea added new file about creating your SSH keys 2015-06-22 08:54:40 -07:00
Dmitriy Zaporozhets bcb07929fe Merge branch 'nginx_defaulthost_documentation' into 'master'
Close #178 Nginx conf default_host documentation

This closes #178
We're just making it clear that some nginx installs such as by default on recent Ubuntu's, the /etc/nginx/sites-enabled/default file will conflict the listen line of the gitlab nginx conf's due to the default_server directive.

changed installation.md to identify the issue to a user
added notes to both nginx configs for gitlab and gitlab-ssl
[ci-skip

See merge request !225
2015-06-22 13:22:58 +00:00
Dmitriy Zaporozhets ea9dda9541 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-22 11:26:33 +02:00
Jeff Blaine 06d2c09f95 Show username SSH config example 2015-06-19 14:49:23 -04:00
Jeff Blaine 39ad10f9fe Include non-default ssh key location info
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/875

Provide help for people who aren't SSH-clued by indicating
how to point to key files that have been named something
other than the default. A lot of people seem to assume that
the filename they choose is irrelevant and then wonder why
their private key is not being found by simple 'ssh' commands.
2015-06-19 14:49:23 -04:00
Job van der Voort 473fb23afc Merge branch 'starting_shell' into 'master'
Starting shell document to GitLab basics

I added a new branch for all the changes on this MR https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1863

Everything should look nicer now :)

See merge request !1869
2015-06-19 16:14:49 +00:00
karen Carias 0221628ffb deleted duplicated file 2015-06-19 08:12:49 -07:00
Jacob Vosmaer 3460759f44 Change RC/final package release timing 2015-06-19 16:44:21 +02:00
Stan Hu 9c47d69788 Update maintenance documentation to explain no need to recompile asssets for omnibus installations 2015-06-19 07:23:45 -07:00
Jacob Vosmaer 94cdc9be11 Define 'everyone' 2015-06-18 18:20:28 +02:00