Merge branch 'release/7.0' into 'master'

Release/7.0

Berksfile.lock

@@ -28,7 +28,7 @@ GRAPH
     mysql-chef_gem (>= 0.0.0)
     postgresql (>= 1.0.0)
     xfs (>= 0.0.0)
-  gitlab (0.6.9)
+  gitlab (0.7.0)
     apt (>= 0.0.0)
     database (>= 0.0.0)
     magic_shell (>= 0.0.0)

README.md

@@ -5,9 +5,9 @@ Chef cookbook with recipes to install GitLab and its dependencies:
 * GitLab: 6.9
 * GitLab Shell: 1.9.4
-* Ruby: 2.0.0-p451
+* Ruby: 2.1.2
 * Redis: 2.6.13
-* Git: 1.8.4.1
+* Git: 2.0.0
 * Nginx: 1.1.19
 * PostgreSQL: 9.3
 * MySQL: 5.5.34
@@ -21,7 +21,7 @@ Cookbook has been tested and it is known to work on:
 ## Installation
-* [Development installation](doc/development.md)
+* [Development installation on metal(oustside of Virtual Machine)](doc/development.md). May run much faster than inside a VM.
 * [Development installation on a virtual machine with Vagrant](doc/development_vagrant.md)

Vagrantfile

@@ -99,8 +99,7 @@ Vagrant.configure("2") do |config|
         "path" => "/gitlab/gitlab",
         "satellites_path" => "/gitlab/gitlab-satellites",
         "repos_path" => "/gitlab/repositories",
-        "shell_path" => "/gitlab/gitlab-shell",
-        "database_adapter" => "mysql"
+        "shell_path" => "/gitlab/gitlab-shell"
       },
       "phantomjs" => {
         "version" => "1.8.1"

attributes/default.rb

@@ -15,7 +15,7 @@ end
 default['gitlab']['packages'] = packages
 default['gitlab']['compile_ruby'] = true
-default['gitlab']['ruby'] = "2.0.0-p451" # Latest 2.0 by ruby-build 20131225.1 (Ubuntu)
+default['gitlab']['ruby'] = "2.1.2" # ruby-build 20140509 (Ubuntu)
 # User
 default['gitlab']['user'] = "git" # Do not change this attribute in production unless you know what you do since some code from the GitLab repo such as init.d script assume it is git.
@@ -54,11 +54,11 @@ if node['gitlab']['env'] == "development"
   default['gitlab']['shell_revision'] = "master"
 else
   default['gitlab']['environments'] = %w{production}
-  default['gitlab']['revision'] = "6-9-stable" # Must be branch, otherwise GitLab update will run on each chef run
+  default['gitlab']['revision'] = "7-0-stable" # Must be branch, otherwise GitLab update will run on each chef run
   default['gitlab']['url'] = "http://localhost:80/"
   default['gitlab']['port'] = "80"
   default['gitlab']['ssh_port'] = "22"
-  default['gitlab']['shell_revision'] = "v1.9.4"
+  default['gitlab']['shell_revision'] = "v1.9.6"
 end
 # GitLab configuration

attributes/git.rb

 # Git
 default['gitlab']['git']['prefix'] = "/usr/local"
-default['gitlab']['git']['version'] = "1.8.5.2"
+default['gitlab']['git']['version'] = "2.0.0"
 default['gitlab']['git']['url'] = "https://codeload.github.com/git/git/zip/v#{node['gitlab']['git']['version']}"
 if platform_family?("rhel")

doc/development_vagrant.md

@@ -47,7 +47,7 @@ Finally, you should be able to start and configure the Vagrant box. This operati
     vagrant up
-You will likely encounter errors during the initial set up provisioning process. It is important to keep rerunning `vagrant provision` until it does not report any errors and returns you to the command prompt. See the Troubleshooting section for help.
+You will likely encounter errors during the initial set up provisioning process. This is due to differences between various OS and different machines this is being ran on. It is important to keep rerunning `vagrant provision` until it does not report any errors and returns you to the command prompt. See the Troubleshooting section for help.
 By default the VM uses 1.5GB of memory and 2 CPU cores. If you want to use more memory or cores you can use the GITLAB_VAGRANT_MEMORY and GITLAB_VAGRANT_CORES environment variables:
@@ -173,5 +173,6 @@ Information
 * GitLab web interface running at: http://localhost:3000/ or http://192.168.3.4:3000/
 * Virtual Machine user/password: vagrant/vagrant
 * GitLab webapp user/password: root/5iveL!fe
+* PostgreSQL user/password: git/datapass
 * MySQL user/password: git/datapass
 * MySQL root password: rootpass

spec/clone_spec.rb

@@ -15,7 +15,7 @@ describe "gitlab::clone" do
       it "clones the gitlab repository" do
         expect(chef_run).to sync_git('/home/git/gitlab').with(
           repository: 'https://github.com/gitlabhq/gitlabhq.git',
-          revision: '6-9-stable',
+          revision: '7-0-stable',
           user: 'git',
           group: 'git'
         )
@@ -49,7 +49,7 @@ describe "gitlab::clone" do
         it "clones the gitlab repository" do
           expect(chef_run).to sync_git('/data/git/gitlab').with(
             repository: 'https://github.com/gitlabhq/gitlabhq.git',
-            revision: '6-9-stable',
+            revision: '7-0-stable',
             user: 'git',
             group: 'git'
           )
@@ -69,7 +69,7 @@ describe "gitlab::clone" do
       it "clones the gitlab repository" do
         expect(chef_run).to sync_git('/home/git/gitlab').with(
           repository: 'https://github.com/gitlabhq/gitlabhq.git',
-          revision: '6-9-stable',
+          revision: '7-0-stable',
           user: 'git',
           group: 'git'
         )
@@ -103,7 +103,7 @@ describe "gitlab::clone" do
         it "clones the gitlab repository" do
           expect(chef_run).to sync_git('/data/git/gitlab').with(
             repository: 'https://github.com/gitlabhq/gitlabhq.git',
-            revision: '6-9-stable',
+            revision: '7-0-stable',
             user: 'git',
             group: 'git'
           )

spec/default_spec.rb

@@ -14,8 +14,8 @@ describe "gitlab::default" do
       before do
         # stubbing commands because real commands are disabled
-        stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(true)
-        stub_command("git --version | grep 1.8.5.2").and_return(true)
+        stub_command("test -f #{Chef::Config['file_cache_path']}/git-2.0.0.zip").and_return(true)
+        stub_command("git --version | grep 2.0.0").and_return(true)
         stub_command("git --version >/dev/null").and_return(true)
         stub_command("/usr/bin/mysql -u root -e 'show databases;'").and_return(true)
         stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'").and_return(true)
@@ -51,8 +51,8 @@ describe "gitlab::default" do
       before do
         # stubbing commands because real commands are disabled
-        stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(true)
-        stub_command("git --version | grep 1.8.5.2").and_return(true)
+        stub_command("test -f #{Chef::Config['file_cache_path']}/git-2.0.0.zip").and_return(true)
+        stub_command("git --version | grep 2.0.0").and_return(true)
         stub_command("git --version >/dev/null").and_return(true)
         stub_command("/usr/bin/mysql -u root -e 'show databases;'").and_return(true)
         stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'").and_return(true)

spec/git_spec.rb

@@ -13,8 +13,8 @@ describe "gitlab::git" do
       end
       before do
-        stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(false)
-        stub_command("git --version | grep 1.8.5.2").and_return(false)
+        stub_command("test -f #{Chef::Config['file_cache_path']}/git-2.0.0.zip").and_return(false)
+        stub_command("git --version | grep 2.0.0").and_return(false)
       end
       it "installs all git required packages" do
@@ -25,12 +25,12 @@ describe "gitlab::git" do
       end
       it 'gets the source code for git' do
-        expect(chef_run).to create_remote_file("#{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").with(mode: 0644, source: "https://codeload.github.com/git/git/zip/v1.8.5.2")
+        expect(chef_run).to create_remote_file("#{Chef::Config['file_cache_path']}/git-2.0.0.zip").with(mode: 0644, source: "https://codeload.github.com/git/git/zip/v2.0.0")
       end
       it 'executes compiling git from source' do
-        resource = chef_run.find_resource(:execute, 'Extracting and Building Git 1.8.5.2 from Source')
-        expect(resource.command).to eq("    unzip -q git-1.8.5.2.zip\n    cd git-1.8.5.2 && make prefix=/usr/local install\n")
+        resource = chef_run.find_resource(:execute, 'Extracting and Building Git 2.0.0 from Source')
+        expect(resource.command).to eq("    unzip -q git-2.0.0.zip\n    cd git-2.0.0 && make prefix=/usr/local install\n")
         expect(resource.cwd).to eq(Chef::Config['file_cache_path'])
       end
     end
@@ -45,8 +45,8 @@ describe "gitlab::git" do
       end
       before do
-        stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(false)
-        stub_command("git --version | grep 1.8.5.2").and_return(false)
+        stub_command("test -f #{Chef::Config['file_cache_path']}/git-2.0.0.zip").and_return(false)
+        stub_command("git --version | grep 2.0.0").and_return(false)
       end
       it "installs all git required packages" do
@@ -57,12 +57,12 @@ describe "gitlab::git" do
       end
       it 'gets the source code for git' do
-        expect(chef_run).to create_remote_file("#{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").with(mode: 0644, source: "https://codeload.github.com/git/git/zip/v1.8.5.2")
+        expect(chef_run).to create_remote_file("#{Chef::Config['file_cache_path']}/git-2.0.0.zip").with(mode: 0644, source: "https://codeload.github.com/git/git/zip/v2.0.0")
       end
       it 'executes compiling git from source' do
-        resource = chef_run.find_resource(:execute, 'Extracting and Building Git 1.8.5.2 from Source')
-        expect(resource.command).to eq("    unzip -q git-1.8.5.2.zip\n    cd git-1.8.5.2 && make prefix=/usr/local install\n")
+        resource = chef_run.find_resource(:execute, 'Extracting and Building Git 2.0.0 from Source')
+        expect(resource.command).to eq("    unzip -q git-2.0.0.zip\n    cd git-2.0.0 && make prefix=/usr/local install\n")
         expect(resource.cwd).to eq(Chef::Config['file_cache_path'])
       end
     end

spec/gitlab_shell_clone_spec.rb

@@ -15,7 +15,7 @@ describe "gitlab::gitlab_shell_clone" do
       it "clones the gitlab-shell repository" do
         expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
           repository: 'https://github.com/gitlabhq/gitlab-shell.git',
-          revision: "v1.9.4",
+          revision: "v1.9.6",
           user: 'git',
           group: 'git'
         )
@@ -64,7 +64,7 @@ describe "gitlab::gitlab_shell_clone" do
       it "clones the gitlab-shell repository" do
         expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
           repository: 'https://github.com/gitlabhq/gitlab-shell.git',
-          revision: "v1.9.4",
+          revision: "v1.9.6",
           user: 'git',
           group: 'git'
         )

spec/packages_spec.rb

@@ -10,8 +10,8 @@ describe "gitlab::packages" do
       before do
         # stubbing git commands because packages recipe requires gitlab::git
-        stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(true)
-        stub_command("git --version | grep 1.8.5.2").and_return(true)
+        stub_command("test -f #{Chef::Config['file_cache_path']}/git-2.0.0.zip").and_return(true)
+        stub_command("git --version | grep 2.0.0").and_return(true)
         stub_command("git --version >/dev/null").and_return(true)
       end
@@ -42,8 +42,8 @@ describe "gitlab::packages" do
       before do
         # stubbing git commands because packages recipe requires gitlab::git
-        stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(true)
-        stub_command("git --version | grep 1.8.5.2").and_return(true)
+        stub_command("test -f #{Chef::Config['file_cache_path']}/git-2.0.0.zip").and_return(true)
+        stub_command("git --version | grep 2.0.0").and_return(true)
         stub_command("git --version >/dev/null").and_return(true)
       end

spec/setup_spec.rb

@@ -19,8 +19,8 @@ describe "gitlab::setup" do
       before do
         # stubbing commands because real commands are disabled
-        stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(true)
-        stub_command("git --version | grep 1.8.5.2").and_return(true)
+        stub_command("test -f #{Chef::Config['file_cache_path']}/git-2.0.0.zip").and_return(true)
+        stub_command("git --version | grep 2.0.0").and_return(true)
         stub_command("git --version >/dev/null").and_return(true)
         stub_command("/usr/bin/mysql -u root -e 'show databases;'").and_return(true)
         stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'").and_return(true)
@@ -89,8 +89,8 @@ describe "gitlab::setup" do
       before do
         # stubbing commands because real commands are disabled
-        stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(true)
-        stub_command("git --version | grep 1.8.5.2").and_return(true)
+        stub_command("test -f #{Chef::Config['file_cache_path']}/git-2.0.0.zip").and_return(true)
+        stub_command("git --version | grep 2.0.0").and_return(true)
         stub_command("git --version >/dev/null").and_return(true)
         stub_command("/usr/bin/mysql -u root -e 'show databases;'").and_return(true)
         stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'").and_return(true)

templates/default/nginx.erb

@@ -73,11 +73,12 @@ server {
     proxy_set_header   Host              $http_host;
     proxy_set_header   X-Real-IP         $remote_addr;
     proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Frame-Options   SAMEORIGIN;
     proxy_pass http://gitlab;
   }
-   # Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
+  # Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
   # WARNING: If you are using relative urls do remove the block below
   # See config/application.rb under "Relative url support" for the list of
   # other files that need to be changed for relative url support