Merge branch 'master' of github.com:gitlabhq/gitlabhq

5 files changed, 21 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index aa822771ec2..d151849b713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ doc/code/*
 public/uploads.*
 public/assets/
 .envrc
+dump.rdb
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 48e6ea91d94..82ec68c9165 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -25,7 +25,7 @@
     - unless empty_repo
       .col-md-4
         .project-home-links
-          = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
-          = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
-          = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
+          = link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
+          = link_to pluralize(number_with_delimiter(@repository.branch_names.count), 'branch'), project_branches_path(@project)
+          = link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), project_tags_path(@project)
           %span.light.prepend-left-20= repository_size
diff --git a/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb b/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb
new file mode 100644
index 00000000000..1f6d85d5f66
--- /dev/null
+++ b/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb
@@ -0,0 +1,11 @@
+class ChangeStateToAllowEmptyMergeRequestDiffs < ActiveRecord::Migration
+  def up
+    change_column :merge_request_diffs, :state, :string, null: true,
+                  default: nil
+  end
+
+  def down
+    change_column :merge_request_diffs, :state, :string, null: false,
+                  default: 'collected'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9033aa92ac9..265d556bd27 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140407135544) do
+ActiveRecord::Schema.define(version: 20140414131055) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -109,10 +109,10 @@ ActiveRecord::Schema.define(version: 20140407135544) do
   add_index "keys", ["user_id"], name: "index_keys_on_user_id", using: :btree
 
   create_table "merge_request_diffs", force: true do |t|
-    t.string   "state",            default: "collected", null: false
+    t.string   "state"
     t.text     "st_commits"
     t.text     "st_diffs"
-    t.integer  "merge_request_id",                       null: false
+    t.integer  "merge_request_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 1c7a02cecec..e2b37b0788a 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -179,7 +179,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
     cd /home/git/gitlab
 
 **Note:**
-You can change `6-6-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+You can change `6-7-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
 ## Configure it
 
@@ -421,9 +421,9 @@ These steps are fairly general and you will need to figure out the exact details
 * Stop GitLab
 		`sudo service gitlab stop`
 
-* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/gitlab.yml.example) as a reference)
+* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example) as a reference)
 
-* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterGemfile)
+* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile)
                 `gem "omniauth-your-auth-provider"`
 * If you're using MySQL, install the new Omniauth provider gem by running the following command:
 		`sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment`