Release 8.5.2
- Picked into respective
stablebranches.Picked into Stable8.5 merged merge requests:-
omnibus-gitlab!659 (merged) -
omnibus-gitlab!663 (merged) (changelog missing!) -
omnibus-gitlab!665 (merged) -
omnibus-gitlab!668 (merged) -
gitlab-org/gitlab-ee!221 (changelog missing! duplicate the 8.4.5 item) -
gitlab-org/gitlab-ee!222 -
gitlab-org/gitlab-ee!230 (UI improvements based on CE, no changelog needed) -
gitlab-org/gitlab-ee!233 (fix gitlab-org/gitlab-ee!230, no changelog needed) -
!2620 (merged) -
!2924 (merged) -
!2927 (merged) -
!2963 (merged) (fix tests, no changelog) -
!2964 (merged) -
!2968 (merged) (CE twin of gitlab-org/gitlab-ee!222, no changelog) -
!2969 (merged) (Gemfile.lock, no changelog) -
!2978 (merged) -
!2979 (merged) (Fixes #13730 (closed), #13727 (closed), omnibus-gitlab#1143 (closed), https://github.com/gitlabhq/gitlabhq/issues/10053 and https://github.com/gitlabhq/gitlabhq/issues/10058) -
!2986 (merged) -
!2988 (merged) -
!2989 (merged) (fix !2620 (merged), no changelog) -
!2991 (merged) -
!3011 (merged) (fix !2927 (merged), no changelog) -
!3014 (merged) -
!3016 (merged) -
!3020 (merged) (changelog missing!) -
!3030 (merged) -
!3043 (merged) (fix !2989 (merged), no changelog) -
!3059 (merged) -
!3064 (merged)
-
-
Check ce/8-5-stableCHANGELOG -
Check ee/8-5-stable-eeCHANGELOG -
Check omnibus-gitlab/8-5-stableCHANGELOG -
Check omnibus-gitlab/8-5-stable-eeCHANGELOG -
Merge ce/8-5-stableintoee/8-5-stable-ee -
Check for any migrations in CE: git diff v8.5.1..8-5-stable -- db/
diff --git a/db/migrate/20160222153918_create_appearances_ce.rb b/db/migrate/20160222153918_create_appearances_ce.rb
new file mode 100644
index 0000000..bec66bc
--- /dev/null
+++ b/db/migrate/20160222153918_create_appearances_ce.rb
@@ -0,0 +1,14 @@
+class CreateAppearancesCe < ActiveRecord::Migration
+ def change
+ unless table_exists?(:appearances)
+ create_table :appearances do |t|
+ t.string :title
+ t.text :description
+ t.string :header_logo
+ t.string :logo
+
+ t.timestamps null: false
+ end
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4708c29..53a941d 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: 20160220123949) do
+ActiveRecord::Schema.define(version: 20160222153918) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -24,6 +24,15 @@ ActiveRecord::Schema.define(version: 20160220123949) do
t.datetime "updated_at"
end
+ create_table "appearances", force: :cascade do |t|
+ t.string "title"
+ t.text "description"
+ t.string "header_logo"
+ t.string "logo"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "application_settings", force: :cascade do |t|
t.integer "default_projects_limit"
t.boolean "signup_enabled"
-
Check for any migrations in EE: git diff v8.5.1-ee..8-5-stable-ee -- db/
diff --git a/db/migrate/20160222153918_create_appearances_ce.rb b/db/migrate/20160222153918_create_appearances_ce.rb
new file mode 100644
index 0000000..bec66bc
--- /dev/null
+++ b/db/migrate/20160222153918_create_appearances_ce.rb
@@ -0,0 +1,14 @@
+class CreateAppearancesCe < ActiveRecord::Migration
+ def change
+ unless table_exists?(:appearances)
+ create_table :appearances do |t|
+ t.string :title
+ t.text :description
+ t.string :header_logo
+ t.string :logo
+
+ t.timestamps null: false
+ end
+ end
+ end
+end
diff --git a/db/migrate/20160302141317_rename_header_field_on_appearrance.rb b/db/migrate/20160302141317_rename_header_field_on_appearrance.rb
new file mode 100644
index 0000000..d9b142d
--- /dev/null
+++ b/db/migrate/20160302141317_rename_header_field_on_appearrance.rb
@@ -0,0 +1,7 @@
+class RenameHeaderFieldOnAppearrance < ActiveRecord::Migration
+ def change
+ rename_column :appearances, :light_logo, :header_logo
+
+ remove_column :appearances, :dark_logo
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 172bb72..4fd0c96 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: 20160220123949) do
+ActiveRecord::Schema.define(version: 20160302141317) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -31,8 +31,7 @@ ActiveRecord::Schema.define(version: 20160220123949) do
t.integer "updated_by"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "dark_logo"
- t.string "light_logo"
+ t.string "header_logo"
end
create_table "application_settings", force: :cascade do |t|
-
Tag 8.5.2using release-tools -
Add patch notice to 8.5 Regressions: 8.5.2 has been tagged, further fixes will go into 8.5.3 as necessary. -
Update masterCHANGELOG -
Deploy 8.5.2to GitLab.com -
Add version 8.5.2to https://version.gitlab.com -
Blog Post: -
Tweet: GitLab 8.5.2 is released! https://about.gitlab.com/2016/03/03/gitlab-8-dot-5-dot-2-released/ Many fixes: Sidebar, Todos, Labels, relative URL installations, and forks list + more!
For references: