diff options
author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-02-21 12:15:58 +1100 |
---|---|---|
committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-02-21 12:15:58 +1100 |
commit | 9a9a368fe0bb0a5983794ab272c2a12259d77939 (patch) | |
tree | b4f6293174c9bf9df2ae0ff8e63f6928fadb046e /app/controllers/concerns | |
parent | 2a12cbe6d6d5c7c78c6fac64e7d5a6af6742462a (diff) | |
parent | 510c51a6b5fd822755046e10f5c5d875ad5fba9f (diff) | |
download | gitlab-ce-9a9a368fe0bb0a5983794ab272c2a12259d77939.tar.gz |
Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_list
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/creates_commit.rb | 16 | ||||
-rw-r--r-- | app/controllers/concerns/snippets_actions.rb | 21 |
2 files changed, 25 insertions, 12 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 6286d67d30c..88d180fcc2e 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -104,23 +104,15 @@ module CreatesCommit if can?(current_user, :push_code, @project) # Edit file in this project @mr_source_project = @project - - if @project.forked? - # Merge request from this project to fork origin - @mr_target_project = @project.forked_from_project - @mr_target_branch = @mr_target_project.repository.root_ref - else - # Merge request to this project - @mr_target_project = @project - @mr_target_branch = @ref || @target_branch - end else # Merge request from fork to this project @mr_source_project = current_user.fork_of(@project) - @mr_target_project = @project - @mr_target_branch = @ref || @target_branch end + # Merge request to this project + @mr_target_project = @project + @mr_target_branch = @ref || @target_branch + @mr_source_branch = guess_mr_source_branch end diff --git a/app/controllers/concerns/snippets_actions.rb b/app/controllers/concerns/snippets_actions.rb new file mode 100644 index 00000000000..ca6dffe1cc5 --- /dev/null +++ b/app/controllers/concerns/snippets_actions.rb @@ -0,0 +1,21 @@ +module SnippetsActions + extend ActiveSupport::Concern + + def edit + end + + def raw + send_data( + convert_line_endings(@snippet.content), + type: 'text/plain; charset=utf-8', + disposition: 'inline', + filename: @snippet.sanitized_file_name + ) + end + + private + + def convert_line_endings(content) + params[:line_ending] == 'raw' ? content : content.gsub(/\r\n/, "\n") + end +end |