mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 21:56:19 +10:00
Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master'
Give last_activity_at a default value so it will always be set For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345 See merge request !1589
This commit is contained in:
@@ -8,6 +8,7 @@ v 7.9.0 (unreleased)
|
||||
- Fix commit comments on first line of diff not rendering in Merge Request Discussion view.
|
||||
- Improve trigger merge request hook when source project branch has been updated (Kirill Zaitsev)
|
||||
- Save web edit in new branch
|
||||
- Fix ordering of imported but unchanged projects (Marco Wessel)
|
||||
|
||||
v 7.8.0
|
||||
- Fix access control and protection against XSS for note attachments and other uploads.
|
||||
|
||||
@@ -48,6 +48,12 @@ class Project < ActiveRecord::Base
|
||||
default_value_for :wall_enabled, false
|
||||
default_value_for :snippets_enabled, gitlab_config_features.snippets
|
||||
|
||||
# set last_activity_at to the same as created_at
|
||||
after_create :set_last_activity_at
|
||||
def set_last_activity_at
|
||||
update_column(:last_activity_at, self.created_at)
|
||||
end
|
||||
|
||||
ActsAsTaggableOn.strict_case_match = true
|
||||
acts_as_taggable_on :tags
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
class SetMissingLastActivityAt < ActiveRecord::Migration
|
||||
def up
|
||||
execute "UPDATE projects SET last_activity_at = updated_at WHERE last_activity_at IS NULL"
|
||||
end
|
||||
|
||||
def down
|
||||
raise ActiveRecord::IrreversibleMigration
|
||||
end
|
||||
end
|
||||
+2
-2
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20150213121042) do
|
||||
ActiveRecord::Schema.define(version: 20150223022001) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
@@ -334,12 +334,12 @@ ActiveRecord::Schema.define(version: 20150213121042) do
|
||||
t.string "import_url"
|
||||
t.integer "visibility_level", default: 0, null: false
|
||||
t.boolean "archived", default: false, null: false
|
||||
t.string "avatar"
|
||||
t.string "import_status"
|
||||
t.float "repository_size", default: 0.0
|
||||
t.integer "star_count", default: 0, null: false
|
||||
t.string "import_type"
|
||||
t.string "import_source"
|
||||
t.string "avatar"
|
||||
end
|
||||
|
||||
add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree
|
||||
|
||||
Reference in New Issue
Block a user