Download as
Browse Code »

Commit 6be82c5e3b65bccc5b951628de34ebe94e06fdec

Authored by Dmitriy Zaporozhets
2 parents 448e5c13 17befe2a
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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

Showing 5 changed files with 21 additions and 9 deletions   Show diff stats
@@ -36,3 +36,4 @@ doc/code/* @@ -36,3 +36,4 @@ doc/code/*
36 public/uploads.* 36 public/uploads.*
37 public/assets/ 37 public/assets/
38 .envrc 38 .envrc
  39 +dump.rdb
app/views/projects/_home_panel.html.haml
  Diff comments   View file @6be82c5
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 - unless empty_repo 25 - unless empty_repo
26 .col-md-4 26 .col-md-4
27 .project-home-links 27 .project-home-links
28 - = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref)  
29 - = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)  
30 - = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project) 28 + = link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
  29 + = link_to pluralize(number_with_delimiter(@repository.branch_names.count), 'branch'), project_branches_path(@project)
  30 + = link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), project_tags_path(@project)
31 %span.light.prepend-left-20= repository_size 31 %span.light.prepend-left-20= repository_size
db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb 0 → 100644
  Diff comments   View file @6be82c5
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +class ChangeStateToAllowEmptyMergeRequestDiffs < ActiveRecord::Migration
  2 + def up
  3 + change_column :merge_request_diffs, :state, :string, null: true,
  4 + default: nil
  5 + end
  6 +
  7 + def down
  8 + change_column :merge_request_diffs, :state, :string, null: false,
  9 + default: 'collected'
  10 + end
  11 +end
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 # 11 #
12 # It's strongly recommended that you check this file into your version control system. 12 # It's strongly recommended that you check this file into your version control system.
13 13
14 -ActiveRecord::Schema.define(version: 20140407135544) do 14 +ActiveRecord::Schema.define(version: 20140414131055) do
15 15
16 # These are extensions that must be enabled in order to support this database 16 # These are extensions that must be enabled in order to support this database
17 enable_extension "plpgsql" 17 enable_extension "plpgsql"
@@ -109,10 +109,10 @@ ActiveRecord::Schema.define(version: 20140407135544) do @@ -109,10 +109,10 @@ ActiveRecord::Schema.define(version: 20140407135544) do
109 add_index "keys", ["user_id"], name: "index_keys_on_user_id", using: :btree 109 add_index "keys", ["user_id"], name: "index_keys_on_user_id", using: :btree
110 110
111 create_table "merge_request_diffs", force: true do |t| 111 create_table "merge_request_diffs", force: true do |t|
112 - t.string "state", default: "collected", null: false 112 + t.string "state"
113 t.text "st_commits" 113 t.text "st_commits"
114 t.text "st_diffs" 114 t.text "st_diffs"
115 - t.integer "merge_request_id", null: false 115 + t.integer "merge_request_id", null: false
116 t.datetime "created_at" 116 t.datetime "created_at"
117 t.datetime "updated_at" 117 t.datetime "updated_at"
118 end 118 end
doc/install/installation.md
  Diff comments   View file @6be82c5
@@ -179,7 +179,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da @@ -179,7 +179,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
179 cd /home/git/gitlab 179 cd /home/git/gitlab
180 180
181 **Note:** 181 **Note:**
182 -You can change `6-6-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! 182 +You can change `6-7-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
183 183
184 ## Configure it 184 ## Configure it
185 185
@@ -421,9 +421,9 @@ These steps are fairly general and you will need to figure out the exact details @@ -421,9 +421,9 @@ These steps are fairly general and you will need to figure out the exact details
421 * Stop GitLab 421 * Stop GitLab
422 `sudo service gitlab stop` 422 `sudo service gitlab stop`
423 423
424 -* 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) 424 +* 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)
425 425
426 -* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterGemfile) 426 +* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile)
427 `gem "omniauth-your-auth-provider"` 427 `gem "omniauth-your-auth-provider"`
428 * If you're using MySQL, install the new Omniauth provider gem by running the following command: 428 * If you're using MySQL, install the new Omniauth provider gem by running the following command:
429 `sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment` 429 `sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment`