Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow user to specify content he wants to see on project pageproject-default-view | Dmitriy Zaporozhets | 2015-07-13 | 1 | -0/+6 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | added link to issue closing pattern in doc | karen Carias | 2015-07-10 | 1 | -0/+2 |
| | |||||
* | Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries" | Stan Hu | 2015-07-09 | 1 | -8/+2 |
| | | | | This reverts commit dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b. | ||||
* | api: add 'system', 'upvote', and 'downvote' fields to note queries | Ben Boeckel | 2015-07-09 | 1 | -2/+8 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-07-08 | 1 | -1/+5 |
|\ | |||||
| * | Merge branch 'add-ie-compat-notice' into 'master' | Job van der Voort | 2015-07-08 | 1 | -1/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Added info about common UI problems if IE Compatibility View mode is enabled. /cc @sytses @Haydn See merge request !939 | ||||
| | * | Added info about common UI problems if IE Compatibility View mode is enabled.add-ie-compat-notice | Patricio Cano | 2015-07-07 | 1 | -1/+5 |
| | | | |||||
* | | | Make sure webhooks are mentioned at the top level. | Sytse Sijbrandij | 2015-07-08 | 2 | -5/+8 |
|/ / | |||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Jacob Vosmaer | 2015-07-08 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #9435 from bbodenmiller/patch-1 | stanhu | 2015-07-07 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | use relative link to SSH setup page | ||||
| | * | use relative link to SSH setup page | Ben Bodenmiller | 2015-07-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Jacob Vosmaer | 2015-07-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'fix-irker-capitalization' into 'master' | Robert Schilling | 2015-07-08 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Change "Irc Uri" -> "IRC URI" See merge request !937 | ||||
| | * | | | Change "Irc Uri" -> "IRC URI" | Stan Hu | 2015-07-07 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
* | | | | Merge branch 'create-group' into 'master' | Job van der Voort | 2015-07-07 | 6 | -1/+46 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | fixed text | karen Carias | 2015-07-07 | 1 | -10/+14 |
| | | | | | |||||
| * | | | | fixed typo | karen Carias | 2015-07-07 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | fixed image | karen Carias | 2015-07-07 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | fixed document with improved instructions | karen Carias | 2015-07-07 | 3 | -15/+11 |
| | | | | | |||||
| * | | | | new doc about creating groups | karen Carias | 2015-07-02 | 3 | -1/+46 |
| | | | | | |||||
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Sytse Sijbrandij | 2015-07-07 | 1 | -1/+3 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: doc/install/requirements.md | ||||
| * | | | | Add link to multiple app servers. | Sytse Sijbrandij | 2015-07-07 | 1 | -0/+2 |
| | |_|/ | |/| | | |||||
* | | | | Specify that swap will be slow. | Sytse Sijbrandij | 2015-07-07 | 1 | -9/+10 |
|/ / / | |||||
* | | | Merge branch 'compress-db' into 'master' | Kamil TrzciĆski | 2015-07-07 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Compress database backup | Kamil Trzcinski | 2015-07-06 | 1 | -1/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'settings-via-api' into 'master' | Dmitriy Zaporozhets | 2015-07-07 | 2 | -0/+89 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | API to set application settings for admin Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !934 | ||||
| * | | Add docs and empty specs for applicaiton settings API | Dmitriy Zaporozhets | 2015-07-06 | 2 | -0/+89 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-07-06 | 2 | -22/+57 |
|\ \ \ | |||||
| * \ \ | Merge branch 'add-irker-options' into 'master' | Dmitriy Zaporozhets | 2015-07-06 | 1 | -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  ### After  See merge request !930 | ||||
| | * | | | Add Irker service configuration options | Stan Hu | 2015-07-05 | 1 | -22/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139 | ||||
| * | | | | Merge branch 'doc-list' into 'master' | Robert Speicher | 2015-07-05 | 1 | -0/+30 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation of lists in Markdown See merge request !899 | ||||
| | * | | | | Improve documentation of lists in Markdown | Raniere Silva | 2015-07-03 | 1 | -0/+30 |
| | | | | | | |||||
* | | | | | | fixed link to gitlab-basics | karen Carias | 2015-07-05 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Jacob Vosmaer | 2015-07-03 | 1 | -0/+28 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Allow user to be blocked and unblocked via the API | Steve Norman | 2015-07-03 | 1 | -0/+28 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'create-final-rc' into 'master' | Job van der Voort | 2015-07-02 | 1 | -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 timing | Jacob Vosmaer | 2015-06-19 | 1 | -5/+10 |
| | | | | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-07-02 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Add Troubleshooting section to SAML doc.saml-troubleshooting | Douwe Maan | 2015-07-01 | 1 | -0/+5 |
| | |_|/ | |/| | | |||||
* | | | | fixed link | karen Carias | 2015-07-01 | 1 | -2/+2 |
| | | | | |||||
* | | | | new document about creating a project | karen Carias | 2015-07-01 | 5 | -4/+29 |
|/ / / | |||||
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-07-01 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Reporter role can manage issue tracker nowreporter-manage-issues | Dmitriy Zaporozhets | 2015-06-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'commandline' into 'master' | Job van der Voort | 2015-07-01 | 46 | -11/+146 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | added new doc "command line commands" Added new doc to GitLab Basics See merge request !1880 | ||||
| * | | | small fixes | karen Carias | 2015-06-30 | 1 | -3/+1 |
| | | | | |||||
| * | | | organized commands | karen Carias | 2015-06-30 | 2 | -55/+54 |
| | | | | |||||
| * | | | fixed typo | karen Carias | 2015-06-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | added new links | karen Carias | 2015-06-30 | 3 | -6/+6 |
| | | | | |||||
| * | | | renamed files with hyphen | karen Carias | 2015-06-30 | 45 | -3/+3 |
| | | | | |||||
| * | | | fixed title | karen Carias | 2015-06-29 | 1 | -1/+1 |
| | | | |