diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-18 05:00:36 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-18 05:00:36 +0300 |
| commit | 52acd2b45c3676bae3cb9a1c008e4deada3ca840 (patch) | |
| tree | 0f7f4ac228cf4cd3623f1d1474017a7facb47cf7 /app/controllers | |
| parent | cc4a3b6b620240b72d4138b4e210c047899ac2b3 (diff) | |
| parent | 7ff9c8229d8df09be5927086222aad0cd5d71477 (diff) | |
Merge branch 'external_wiki' into 'master'
Add support for external wikis
## What does this MR do?
This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link.
Currently this is realised as a service.
## What Use Case does this MR solve?
In my Company we already have a wiki System (Confluence).
We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides.
This currently only leaves us two choices:
1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui.
2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one.
Both solutions are not really good.
So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab?
Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :)
This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki.
## Screenshot:
See merge request !291
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 570447c746c..9a484c109ba 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -53,7 +53,7 @@ class Projects::ServicesController < Projects::ApplicationController :description, :issues_url, :new_issue_url, :restrict_to_branch, :channel, :colorize_messages, :channels, :push_events, :issues_events, :merge_requests_events, :tag_push_events, - :note_events, :send_from_committer_email, :disable_diffs + :note_events, :send_from_committer_email, :disable_diffs, :external_wiki_url ) end end |