diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-06 16:27:35 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-06 16:27:35 +0000 |
| commit | 08b3ee8b44692a60580128f741f055afcacf4b0b (patch) | |
| tree | 986c1d2a58b77a446612d4f700bb2a3cfcc0caea | |
| parent | a90f3d38933a8067fb320cd89a833817d604b2b0 (diff) | |
| parent | 084dfd733f950baed312f2c02e045c5222a9dd34 (diff) | |
| download | gitlab-ce-08b3ee8b44692a60580128f741f055afcacf4b0b.tar.gz | |
Merge branch '11-0-stable-prepare-rc5' into '11-0-stable'
Prepare 11.0 RC5 release
See merge request gitlab-org/gitlab-ce!19476
| -rw-r--r-- | changelogs/unreleased/rails5-fix-46281.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/database/median.rb | 9 | ||||
| -rw-r--r-- | lib/gitlab/slash_commands/command.rb | 18 |
3 files changed, 22 insertions, 10 deletions
diff --git a/changelogs/unreleased/rails5-fix-46281.yml b/changelogs/unreleased/rails5-fix-46281.yml new file mode 100644 index 00000000000..ee0b8531988 --- /dev/null +++ b/changelogs/unreleased/rails5-fix-46281.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 fix arel from +merge_request: 19340 +author: Jasper Maes +type: fixed diff --git a/lib/gitlab/database/median.rb b/lib/gitlab/database/median.rb index 74fed447289..3cac007a42c 100644 --- a/lib/gitlab/database/median.rb +++ b/lib/gitlab/database/median.rb @@ -143,8 +143,13 @@ module Gitlab .order(arel_table[column_sym]) ).as('row_id') - count = arel_table.from(arel_table.alias) - .project('COUNT(*)') + arel_from = if Gitlab.rails5? + arel_table.from.from(arel_table.alias) + else + arel_table.from(arel_table.alias) + end + + count = arel_from.project('COUNT(*)') .where(arel_table[partition_column].eq(arel_table.alias[partition_column])) .as('ct') diff --git a/lib/gitlab/slash_commands/command.rb b/lib/gitlab/slash_commands/command.rb index bb778f37096..c82320a6036 100644 --- a/lib/gitlab/slash_commands/command.rb +++ b/lib/gitlab/slash_commands/command.rb @@ -1,13 +1,15 @@ module Gitlab module SlashCommands class Command < BaseCommand - COMMANDS = [ - Gitlab::SlashCommands::IssueShow, - Gitlab::SlashCommands::IssueNew, - Gitlab::SlashCommands::IssueSearch, - Gitlab::SlashCommands::IssueMove, - Gitlab::SlashCommands::Deploy - ].freeze + def self.commands + [ + Gitlab::SlashCommands::IssueShow, + Gitlab::SlashCommands::IssueNew, + Gitlab::SlashCommands::IssueSearch, + Gitlab::SlashCommands::IssueMove, + Gitlab::SlashCommands::Deploy + ] + end def execute command, match = match_command @@ -37,7 +39,7 @@ module Gitlab private def available_commands - COMMANDS.select do |klass| + self.class.commands.keep_if do |klass| klass.available?(project) end end |