diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 10:26:49 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 10:26:49 +0000 |
| commit | 657c4c18be9391d2e021f47294ce929812c9277f (patch) | |
| tree | be9a494779c13c089c2698dc8b2da0681bf3fa45 | |
| parent | be88e942a85a51ad267502e577ee578f58f3f226 (diff) | |
| parent | f60cb12f695f8da02ca7547e41e37e0f8dbb958d (diff) | |
| download | gitlab-ce-27955-mr-notification-use-pipeline-language.tar.gz | |
Merge branch 'master' into 27955-mr-notification-use-pipeline-language27955-mr-notification-use-pipeline-language
* master:
Rename issuable to IssueBase
| -rw-r--r-- | lib/gitlab/chat_commands/presenters/issue_base.rb (renamed from lib/gitlab/chat_commands/presenters/issuable.rb) | 2 | ||||
| -rw-r--r-- | lib/gitlab/chat_commands/presenters/issue_new.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/chat_commands/presenters/issue_search.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/chat_commands/presenters/issue_show.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/chat_commands/presenters/issuable.rb b/lib/gitlab/chat_commands/presenters/issue_base.rb index dfb1c8f6616..a0058407fb2 100644 --- a/lib/gitlab/chat_commands/presenters/issuable.rb +++ b/lib/gitlab/chat_commands/presenters/issue_base.rb @@ -1,7 +1,7 @@ module Gitlab module ChatCommands module Presenters - module Issuable + module IssueBase def color(issuable) issuable.open? ? '#38ae67' : '#d22852' end diff --git a/lib/gitlab/chat_commands/presenters/issue_new.rb b/lib/gitlab/chat_commands/presenters/issue_new.rb index a1a3add56c9..0d31660039a 100644 --- a/lib/gitlab/chat_commands/presenters/issue_new.rb +++ b/lib/gitlab/chat_commands/presenters/issue_new.rb @@ -2,7 +2,7 @@ module Gitlab module ChatCommands module Presenters class IssueNew < Presenters::Base - include Presenters::Issuable + include Presenters::IssueBase def present in_channel_response(new_issue) diff --git a/lib/gitlab/chat_commands/presenters/issue_search.rb b/lib/gitlab/chat_commands/presenters/issue_search.rb index 3478359b91d..73788cf9662 100644 --- a/lib/gitlab/chat_commands/presenters/issue_search.rb +++ b/lib/gitlab/chat_commands/presenters/issue_search.rb @@ -2,7 +2,7 @@ module Gitlab module ChatCommands module Presenters class IssueSearch < Presenters::Base - include Presenters::Issuable + include Presenters::IssueBase def present text = if @resource.count >= 5 diff --git a/lib/gitlab/chat_commands/presenters/issue_show.rb b/lib/gitlab/chat_commands/presenters/issue_show.rb index fe5847ccd15..bd784ad241e 100644 --- a/lib/gitlab/chat_commands/presenters/issue_show.rb +++ b/lib/gitlab/chat_commands/presenters/issue_show.rb @@ -2,7 +2,7 @@ module Gitlab module ChatCommands module Presenters class IssueShow < Presenters::Base - include Presenters::Issuable + include Presenters::IssueBase def present if @resource.confidential? |