Release 8.5.5
-
Picked into respective
stable
branches.Picked into Stable
8.5 merged merge requests:-
omnibus-gitlab!669 (merged) (no changelog needed) -
omnibus-gitlab!679 (merged) (changelog ok) -
gitlab-org/gitlab-ee!179 (changelog ok) -
gitlab-org/gitlab-ee!212 (changelog ok) -
gitlab-org/gitlab-ee!219 (changelog ok) -
gitlab-org/gitlab-ee!223 (changelog ok) -
gitlab-org/gitlab-ee!251 (changelog ok) -
gitlab-org/gitlab-ee!252 (changelog ok) -
gitlab-org/gitlab-ee!247 (no changelog, fixes !219 (closed)) -
gitlab-org/gitlab-ce!3044 (changelog in EE) -
gitlab-org/gitlab-ce!3141 (changelog ok) -
gitlab-org/gitlab-ce!3149 (changelog ok) -
gitlab-org/gitlab-ce!3159 (changelog ok)
-
-
Check ce/8-5-stable
CHANGELOG -
Merge ce/8-5-stable
intoee/8-5-stable-ee
-
Check for any migrations in CE (and paste the diff below): git diff v8.5.4..8-5-stable -- db/
diff --git a/db/migrate/20160309140734_fix_todos.rb b/db/migrate/20160309140734_fix_todos.rb new file mode 100644 index 0000000..ebe0fc8 --- /dev/null +++ b/db/migrate/20160309140734_fix_todos.rb @@ -0,0 +1,16 @@ +class FixTodos < ActiveRecord::Migration
- def up
- execute <<-SQL
-
DELETE FROM todos
-
WHERE todos.target_type IN ('Commit', 'ProjectSnippet')
-
OR NOT EXISTS (
-
SELECT *
-
FROM projects
-
WHERE projects.id = todos.project_id
-
)
- SQL
- end
- def down
- end
+end
```diff
diff --git a/db/schema.rb b/db/schema.rb index 53a941d..3c839db 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ -ActiveRecord::Schema.define(version: 20160222153918) do +ActiveRecord::Schema.define(version: 20160309140734) do ```
-
Check for any migrations in EE (and paste the diff below): git diff v8.5.4-ee..8-5-stable-ee -- db/
diff --git a/db/migrate/20160221013512_add_geo_node_key_to_geo_node.rb b/db/migrate/20160221013512_add_geo_node_key_to_geo_node.rb new file mode 100644 index 0000000..df35739 --- /dev/null +++ b/db/migrate/20160221013512_add_geo_node_key_to_geo_node.rb @@ -0,0 +1,7 @@ +class AddGeoNodeKeyToGeoNode < ActiveRecord::Migration
- def change
- change_table :geo_nodes do |t|
-
t.belongs_to :geo_node_key, index: true
- end
- end
+end
```diff
diff --git a/db/schema.rb b/db/schema.rb index 4fd0c96..077e5bc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -413,8 +413,10 @@ ActiveRecord::Schema.define(version: 20160302141317) do t.integer "port" t.string "relative_url_root" t.boolean "primary"
- t.integer "geo_node_key_id" end
- add_index "geo_nodes", ["geo_node_key_id"], name: "index_geo_nodes_on_geo_node_key_id", using: :btree
add_index "geo_nodes", ["host"], name: "index_geo_nodes_on_host", using: :btree
add_index "geo_nodes", ["primary"], name: "index_geo_nodes_on_primary", using: :btree
-
Tag and build (this is CI-automatized) the 8.5.5
version using therelease
task:bundle exec rake "release[8.5.5]"
-
Check that packages are built and appear under gitlab/gitlab-ee
andgitlab/gitlab-ce
on https://packages.gitlab.com -
Add patch notice to 8.5 Regressions: `8.5.5` has been tagged, further fixes will go into `8.5.6` as necessary.
-
Deploy 8.5.5
to GitLab.com -
Create the 8.5.5
version on https://version.gitlab.com -
Blog Post: -
Add ce/v8.5.5
CHANGELOG items toce/master
CHANGELOG. Be sure to move !3149 changelog item to 8.5.5! -
Add ee/v8.5.5-ee
CHANGELOG-EE items toee/master
CHANGELOG-EE -
Add omnibus-gitlab/v8.5.5+ee.0
CHANGELOG items toomnibus-gitlab/master
CHANGELOG -
Create the next patch issue (if needed) using the patch_issue
task (and put a reference to it below):bundle exec rake "patch_issue[8.5.6]"
For references: