diff options
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/markdown_area.js.coffee | 19 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/sessions_controller.rb | 8 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 2 | ||||
| -rw-r--r-- | app/models/repository.rb | 16 | ||||
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 1 | ||||
| -rw-r--r-- | app/views/layouts/_public_head_panel.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/commits/_diff_file.html.haml | 5 |
10 files changed, 49 insertions, 15 deletions
diff --git a/CHANGELOG b/CHANGELOG index 798a63fe0fd..6eb65360d70 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +v 7.1.1 + - Fix cpu usage issue in Firefox + - Fix redirect loop when changing password by new user + - Fix 500 error on new merge request page + v 7.1.0 - Remove observers - Improve MR discussions @@ -1 +1 @@ -7.1.0 +7.1.1 diff --git a/app/assets/javascripts/markdown_area.js.coffee b/app/assets/javascripts/markdown_area.js.coffee index 1449735fae9..bee2785562d 100644 --- a/app/assets/javascripts/markdown_area.js.coffee +++ b/app/assets/javascripts/markdown_area.js.coffee @@ -20,6 +20,9 @@ $(document).ready -> $(".div-dropzone-hover").append iconPicture $(".div-dropzone").append divSpinner $(".div-dropzone-spinner").append iconSpinner + $(".div-dropzone-spinner").css + "opacity": 0 + "display": "none" dropzone = $(".div-dropzone").dropzone( url: project_image_path_upload @@ -66,13 +69,17 @@ $(document).ready -> return sending: -> - $(".div-dropzone-spinner").css "opacity", 0.7 + $(".div-dropzone-spinner").css + "opacity": 0.7 + "display": "inherit" return complete: -> $(".dz-preview").remove() $(".markdown-area").trigger "input" - $(".div-dropzone-spinner").css "opacity", 0 + $(".div-dropzone-spinner").css + "opacity": 0 + "display": "none" return ) @@ -163,10 +170,14 @@ $(document).ready -> val + url + "\n" showSpinner = (e) -> - $(".div-dropzone-spinner").css "opacity", 0.7 + $(".div-dropzone-spinner").css + "opacity": 0.7 + "display": "inherit" closeSpinner = -> - $(".div-dropzone-spinner").css "opacity", 0 + $(".div-dropzone-spinner").css + "opacity": 0 + "display": "none" showError = (message) -> checkIfMsgExists = $(".error-alert").children().length diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index fcc6384e27c..3f0833303ab 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -70,7 +70,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @target_project = merge_request.target_project @source_project = merge_request.source_project @commits = @merge_request.compare_commits - @commit = @merge_request.compare_base_commit + @commit = @merge_request.compare_commits.last @diffs = @merge_request.compare_diffs @note_counts = Note.where(commit_id: @commits.map(&:id)). group(:commit_id).count diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index f7d5ca08c05..1bdba75c5e7 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,7 +1,7 @@ class SessionsController < Devise::SessionsController def new - redirect_url = if request.referer.present? + redirect_path = if request.referer.present? && (params['redirect_to_referer'] == 'yes') referer_uri = URI(request.referer) if referer_uri.host == Gitlab.config.gitlab.host referer_uri.path @@ -12,7 +12,11 @@ class SessionsController < Devise::SessionsController request.fullpath end - store_location_for(:redirect, redirect_url) + # Prevent a 'you are already signed in' message directly after signing: + # we should never redirect to '/users/sign_in' after signing in successfully. + unless redirect_path == '/users/sign_in' + store_location_for(:redirect, redirect_path) + end super end diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 28486fb41c6..7d2ee85445d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -44,7 +44,7 @@ class MergeRequest < ActiveRecord::Base # Temporary fields to store compare vars # when creating new merge request - attr_accessor :can_be_created, :compare_failed, :compare_base_commit, + attr_accessor :can_be_created, :compare_failed, :compare_commits, :compare_diffs ActsAsTaggableOn.strict_case_match = true diff --git a/app/models/repository.rb b/app/models/repository.rb index 89bf12ce9ef..ab5ef4b1106 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -263,4 +263,20 @@ class Repository contributor end end + + def blob_for_diff(commit, diff) + file = blob_at(commit.id, diff.new_path) + + unless file + file = prev_blob_for_diff(commit, diff) + end + + file + end + + def prev_blob_for_diff(commit, diff) + if commit.parent_id + blob_at(commit.parent_id, diff.old_path) + end + end end diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 466ed1c1760..81dd8887395 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -34,7 +34,6 @@ module MergeRequests # If we have at least one commit to merge -> creation allowed if commits.present? merge_request.compare_commits = Commit.decorate(commits) - merge_request.compare_base_commit = Commit.new(commits.first) merge_request.can_be_created = true merge_request.compare_failed = false diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml index 63992a22f32..b943c3c3f09 100644 --- a/app/views/layouts/_public_head_panel.html.haml +++ b/app/views/layouts/_public_head_panel.html.haml @@ -13,10 +13,10 @@ %i.icon-reorder .pull-right.hidden-xs - = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in btn-new' + = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new' .navbar-collapse.collapse %ul.nav.navbar-nav %li.visible-xs - = link_to "Sign in", new_session_path(:user) + = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes') diff --git a/app/views/projects/commits/_diff_file.html.haml b/app/views/projects/commits/_diff_file.html.haml index 45d1cd9c9a0..9cbcb84aead 100644 --- a/app/views/projects/commits/_diff_file.html.haml +++ b/app/views/projects/commits/_diff_file.html.haml @@ -1,5 +1,4 @@ -- file = project.repository.blob_at(@commit.id, diff.new_path) -- file = project.repository.blob_at(@commit.parent_id, diff.old_path) unless file +- file = project.repository.blob_for_diff(@commit, diff) - return unless file .diff-file{id: "diff-#{i}"} .diff-header{id: "file-path-#{hexdigest(diff.new_path || diff.old_path)}"} @@ -41,7 +40,7 @@ - else = render "projects/commits/text_file", diff: diff, index: i - elsif file.image? - - old_file = project.repository.blob_at(@commit.parent_id, diff.old_path) if @commit.parent_id + - old_file = project.repository.prev_blob_for_diff(@commit, diff) = render "projects/commits/image", diff: diff, old_file: old_file, file: file, index: i - else .nothing-here-block No preview for this file type |