diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-10 10:16:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-10 10:16:25 +0000 |
| commit | f60cb12f695f8da02ca7547e41e37e0f8dbb958d (patch) | |
| tree | e3290ebc71f90258856a8b84472cffa4eb2b2535 | |
| parent | 57d5a5499cc4248176e3740c3aae3fa99be00752 (diff) | |
| parent | 1efa8f2e15664c4268f6357f2a24449c38e5047d (diff) | |
| download | gitlab-ce-f60cb12f695f8da02ca7547e41e37e0f8dbb958d.tar.gz | |
Merge branch 'zj-rename-issuable-issue-base' into 'master'
Rename issuable to IssueBase
See merge request !9127
| -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? |