summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-062-22/+57
|\
| * Merge branch 'add-irker-options' into 'master'Dmitriy Zaporozhets2015-07-061-22/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add Irker service configuration optionsStan Hu2015-07-051-22/+27
| | | | | | | | | | | | | | | | | | Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139
| * | Merge branch 'doc-list' into 'master'Robert Speicher2015-07-051-0/+30
| |\ \ | | | | | | | | | | | | | | | | | | | | Improve documentation of lists in Markdown See merge request !899
| | * | Improve documentation of lists in MarkdownRaniere Silva2015-07-031-0/+30
| | | |
* | | | fixed link to gitlab-basicskaren Carias2015-07-051-1/+1
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJacob Vosmaer2015-07-031-0/+28
|\ \ \
| * | | Allow user to be blocked and unblocked via the APISteve Norman2015-07-031-0/+28
| | | |
* | | | Merge branch 'create-final-rc' into 'master' Job van der Voort2015-07-021-5/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Change RC/final package release timingJacob Vosmaer2015-06-191-5/+10
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-021-0/+5
|\ \ \ \
| * | | | Add Troubleshooting section to SAML doc.saml-troubleshootingDouwe Maan2015-07-011-0/+5
| | |_|/ | |/| |
* | | | fixed linkkaren Carias2015-07-011-2/+2
| | | |
* | | | new document about creating a projectkaren Carias2015-07-015-4/+29
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-011-2/+2
|\ \ \
| * | | Reporter role can manage issue tracker nowreporter-manage-issuesDmitriy Zaporozhets2015-06-301-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'commandline' into 'master'Job van der Voort2015-07-0146-11/+146
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | added new doc "command line commands" Added new doc to GitLab Basics See merge request !1880
| * | | small fixeskaren Carias2015-06-301-3/+1
| | | |
| * | | organized commandskaren Carias2015-06-302-55/+54
| | | |
| * | | fixed typokaren Carias2015-06-301-1/+1
| | | |
| * | | added new linkskaren Carias2015-06-303-6/+6
| | | |
| * | | renamed files with hyphenkaren Carias2015-06-3045-3/+3
| | | |
| * | | fixed titlekaren Carias2015-06-291-1/+1
| | | |
| * | | split to 2 documentskaren Carias2015-06-293-115/+117
| | | |
| * | | fixed clone wordskaren Carias2015-06-251-4/+4
| | | |
| * | | added new doc command line commandskaren Carias2015-06-252-0/+136
| | | | | | | | | | | | | | | | git status
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-291-4/+23
|\ \ \ \
| * | | | Add a troubleshooting section for backup restore docs, explain about ↵add_to_backup_docsMarin Jankovski2015-06-291-4/+23
| | |_|/ | |/| | | | | | | | | | warnings when using omnibus packages.
* | | | Link to SAML docs from doc indexJacob Vosmaer2015-06-291-0/+1
|/ / / | | | | | | | | | Without this link, the SAML docs are hard to discover.
* | | Merge branch 'k-github-ee' into 'master'Job van der Voort2015-06-261-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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
| * | fixed phrasekaren Carias2015-06-251-1/+1
| | |
| * | added info about EEkaren Carias2015-06-251-1/+1
| | |
| * | added info about GitHub importingkaren Carias2015-06-241-1/+3
| | |
* | | Change default admin password from "5iveL!fe" to "password"Robert Speicher2015-06-241-1/+1
| | |
* | | Merge branch 'add-2fa-status-to-admin-api' into 'master'Robert Speicher2015-06-241-2/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 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
| * | Add 2FA status to user admin APIStan Hu2015-06-231-2/+4
| | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9391
* | | Merge branch 'create_ssh' into 'master'Job van der Voort2015-06-232-1/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create SSH keys document @job I created the next document for your review, which is "Creating your SSH Keys" Thanks! See merge request !1875
| * | | added final phrase in dockaren Carias2015-06-231-0/+1
| | | |
| * | | added requested changeskaren Carias2015-06-231-11/+0
| | | |
| * | | added images to dockaren Carias2015-06-221-9/+9
| | | |
| * | | added new file about creating your SSH keyskaren Carias2015-06-222-1/+48
| |/ /
* | | added link to GitLab Basicskaren Carias2015-06-231-0/+1
|/ /
* | Merge branch 'nginx_defaulthost_documentation' into 'master'Dmitriy Zaporozhets2015-06-221-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | adding notes to gitlab nginx confLuke Ashe-Browne2014-12-031-0/+3
| | | | | | | | | | | | | | | We want to make users aware that the nginx default config will conflict with the gitlab default_server conf file.
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-222-5/+38
|\ \ \
| * | | Show username SSH config exampleJeff Blaine2015-06-191-3/+5
| | | |
| * | | Include non-default ssh key location infoJeff Blaine2015-06-191-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Update maintenance documentation to explain no need to recompile asssets for ↵Stan Hu2015-06-191-4/+9
| | |/ | |/| | | | | | | omnibus installations
* | | Merge branch 'starting_shell' into 'master'Job van der Voort2015-06-1942-0/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | deleted duplicated filekaren Carias2015-06-191-67/+0
| | | |