diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-17 20:24:25 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-17 20:24:25 +0300 |
| commit | 694b290a2e1f85c62452835edde0a01348096935 (patch) | |
| tree | 63d30919f4b05abc78e21dc223413aee2ee40696 /app/helpers | |
| parent | b179af197e96ffb9439e9ffea4301023e1399522 (diff) | |
| parent | 8feab9494b65b2854175cfbcf595a103b36a45ea (diff) | |
[skip ci] Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/tree_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index 5e7c20ef51e..dc42caa70e5 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -90,7 +90,7 @@ module TreeHelper end def commit_in_single_accessible_branch - branch_name = html_escape(selected_branch) + branch_name = ERB::Util.html_escape(selected_branch) message = _("Your changes can be committed to %{branch_name} because a merge "\ "request is open.") % { branch_name: "<strong>#{branch_name}</strong>" } |