diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-04 06:58:56 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 14:43:36 +0300 |
| commit | fe38be8be459eaf987e734b16074e22f3a88b5b8 (patch) | |
| tree | 2e90ea204bd41c604d53c477b1986e7d878b7424 /app | |
| parent | 81634bc1f7d8abb1686ca0cf2318bc02f3c7d97c (diff) | |
| download | gitlab-ce-fe38be8be459eaf987e734b16074e22f3a88b5b8.tar.gz | |
Merge branch 'fix-escaped-branches-in-compare' into 'master'
Unescape branch names in compare commit
The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash.
Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here).
* Closes #1399
* Closes https://github.com/gitlabhq/gitlabhq/issues/9105
See merge request !582
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index 146808fa562..e1a8a5b6fa3 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -1,3 +1,5 @@ +require 'addressable/uri' + class Projects::CompareController < Projects::ApplicationController # Authorize before_filter :require_non_empty_project @@ -7,8 +9,8 @@ class Projects::CompareController < Projects::ApplicationController end def show - base_ref = params[:from] - head_ref = params[:to] + base_ref = Addressable::URI.unescape(params[:from]) + head_ref = Addressable::URI.unescape(params[:to]) compare_result = CompareService.new.execute( current_user, |