From 1150bad21fc37f0ed3864eb64f96fac29433c70c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 23 Jan 2014 10:08:26 +0200
Subject: [PATCH 1/3] Fix selectbox when submit MR from fork to origin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/controllers/projects/merge_requests_controller.rb | 4 ++++
app/views/projects/merge_requests/update_branches.js.haml | 8 ++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 0792dbf041f..c66f3de6263 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 6a21551e811..ca21b3bc0de 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");
--
GitLab
From 6f6f1588ba5123f156ee3b0635a061745b71fcde Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 23 Jan 2014 10:13:23 +0200
Subject: [PATCH 2/3] Version 6.5.1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
CHANGELOG | 3 +++
VERSION | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 981fd0e77ab..2e5cd78c8a8 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 f22d756da39..a194c18e86e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.5.0
+6.5.1
--
GitLab
From 3f8e35ce994543ac961e008f345a3db6aff0ced2 Mon Sep 17 00:00:00 2001
From: phieber <patrick.hieber@gmx.net>
Date: Fri, 24 Jan 2014 09:49:59 +0100
Subject: [PATCH 3/3] Install git via PPA instead from source
---
doc/install/installation.md | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 7c3497bb92b..100adafc335 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
--
GitLab