diff --git a/CHANGELOG b/CHANGELOG index 981fd0e77abfadb8ebe6a0cc724110dd165f5310..2e5cd78c8a8a7c9bf099c519fecf9e6d4ab2a1bc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v 6.5.1 + - Fix branch selectbox when create merge request from fork + v 6.5.0 - Dropdown menus on issue#show page for assignee and milestone (Jason Blanchard) - Add color custimization and previewing to broadcast messages diff --git a/VERSION b/VERSION index f22d756da39d4c5f688b56060df98ea326cc0376..a194c18e86e8852fe64f3912531362eadf6fe055 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.5.0 +6.5.1 diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 0792dbf041f35c1c511d2d4e2fd77e2be59d8151..c66f3de6263a77389f183e208f7388dff148aec4 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -152,6 +152,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController @target_project = selected_target_project @target_branches = @target_project.repository.branch_names @target_branches + + respond_to do |format| + format.js + end end def ci_status diff --git a/app/views/projects/merge_requests/update_branches.js.haml b/app/views/projects/merge_requests/update_branches.js.haml index 6a21551e811cfae63db3ed8b536f0d28b7b426de..ca21b3bc0deb365c4db2f3ecc72576c80cd5e4e4 100644 --- a/app/views/projects/merge_requests/update_branches.js.haml +++ b/app/views/projects/merge_requests/update_branches.js.haml @@ -1,5 +1,9 @@ :plain $(".target_branch").html("#{escape_javascript(options_for_select(@target_branches))}"); - $(".target_branch").trigger("select2:updated"); + + $('select.target_branch').select2({ + width: 'resolve', + dropdownAutoWidth: true + }); + $(".mr_target_commit").html(""); - $(".target_branch").trigger("change"); diff --git a/doc/install/installation.md b/doc/install/installation.md index 7c3497bb92b5446a52bd913d4e5a644c9b18537f..100adafc335e809ae008c22a238e0a112b1d9001 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -84,24 +84,21 @@ Make sure you have the right version of Git installed # Make sure Git is version 1.7.10 or higher, for example 1.7.12 or 1.8.4 git --version -Is the system packaged Git too old? Remove it and compile from source. +Is the system packaged Git too old? Remove it and install it from PPA. # Remove packaged Git sudo apt-get remove git-core - # Install dependencies - sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev build-essential + # Install PPA helper + sudo apt-get install -y python-software-properties - # Download and compile from source - cd /tmp - curl --progress https://git-core.googlecode.com/files/git-1.8.4.1.tar.gz | tar xz - cd git-1.8.4.1/ - make prefix=/usr/local all - - # Install into /usr/local/bin - sudo make prefix=/usr/local install - - # When editing config/gitlab.yml (Step 6), change the git bin_path to /usr/local/bin/git + # Download and install from PPA + sudo add-apt-repository ppa:git-core/ppa + sudo apt-get update + sudo apt-get install git-core + + # Verify the installed git version from PPA + git --version **Note:** In order to receive mail notifications, make sure to install a mail server. By default, Debian is shipped with exim4 whereas Ubuntu