From b3ad3f202478dd88a3cfe4461703bc3df1019f90 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Sun, 6 Apr 2014 13:29:29 +0200 Subject: Added the dump.rdb file to gitignore Whenever i'm working on GitLab I have redis running, but redis is generating a db dump file called dump.rdb, I dont think that should be checked in, so it should be on the gitignore list --- .gitignore | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.1 From 6c47514322e7e1e395869ff81af32eb71b074301 Mon Sep 17 00:00:00 2001 From: Marcio Toze Date: Mon, 7 Apr 2014 01:31:02 -0300 Subject: Update installation.md just fix typo fix broken links --- doc/install/installation.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index e1fa822f7d6..d225c31a6c6 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 @@ -422,9 +422,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` -- cgit v1.2.1 From c898dc00dca49e8a073421cbfe0765254e52fed8 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Fri, 11 Apr 2014 22:14:30 +0200 Subject: Make the db and statemachine default is the same --- app/models/merge_request_diff.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 0684461add7..9febdb44994 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -26,7 +26,7 @@ class MergeRequestDiff < ActiveRecord::Base delegate :target_branch, :source_branch, to: :merge_request, prefix: nil - state_machine :state, initial: :empty do + state_machine :state, initial: :collected do state :collected state :timeout state :overflow_commits_safe_size -- cgit v1.2.1 From 802087c937d844d061cacff7fe1d44fd044ee91f Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Mon, 14 Apr 2014 15:22:57 +0200 Subject: Changed default in the database for the statemachine --- app/models/merge_request_diff.rb | 2 +- ...0414131055_change_state_to_allow_empty_merge_request_diffs.rb | 9 +++++++++ db/schema.rb | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 9febdb44994..0684461add7 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -26,7 +26,7 @@ class MergeRequestDiff < ActiveRecord::Base delegate :target_branch, :source_branch, to: :merge_request, prefix: nil - state_machine :state, initial: :collected do + state_machine :state, initial: :empty do state :collected state :timeout state :overflow_commits_safe_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..e131cbd132a --- /dev/null +++ b/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb @@ -0,0 +1,9 @@ +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 -- cgit v1.2.1 From 5554eb166b5cbce0145c3f6220142856742c1ca0 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Mon, 14 Apr 2014 15:24:37 +0200 Subject: Fixed some hound notices --- ...0140414131055_change_state_to_allow_empty_merge_request_diffs.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 index e131cbd132a..1f6d85d5f66 100644 --- 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 @@ -1,9 +1,11 @@ class ChangeStateToAllowEmptyMergeRequestDiffs < ActiveRecord::Migration def up - change_column :merge_request_diffs, :state, :string, null: true, default: nil + 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" + change_column :merge_request_diffs, :state, :string, null: false, + default: 'collected' end end -- cgit v1.2.1 From f34972358c235a3bdd6b688a8303acd9f888d33f Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Mon, 14 Apr 2014 10:59:22 -0500 Subject: Show actual commit count on project dashboard --- app/views/projects/_home_panel.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- cgit v1.2.1