summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-09-07 19:42:18 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-09-07 19:42:18 +0000
commit42e487426da088109e1f1b6270fd181c97cde5f8 (patch)
tree7821fdc4eb37b0163ebd04e55330be3db1d9351b
parent40b0b1a391c0cd1ab9ed405c8663761e40f6defd (diff)
parentf2958ce55450c750f081f2aaf9b7c9feff5a7e79 (diff)
downloadgitlab-ce-42e487426da088109e1f1b6270fd181c97cde5f8.tar.gz
Merge branch 'zj-update-rails-template' into 'master'
Update rails template to include postgres Closes #37156 See merge request !14120
-rw-r--r--changelogs/unreleased/zj-update-rails-template.yml5
-rw-r--r--vendor/project_templates/rails.tar.gzbin24777 -> 25063 bytes
2 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/zj-update-rails-template.yml b/changelogs/unreleased/zj-update-rails-template.yml
new file mode 100644
index 00000000000..5464f0e3d42
--- /dev/null
+++ b/changelogs/unreleased/zj-update-rails-template.yml
@@ -0,0 +1,5 @@
+---
+title: Update Rails project template to use Postgresql by default
+merge_request:
+author:
+type: changed
diff --git a/vendor/project_templates/rails.tar.gz b/vendor/project_templates/rails.tar.gz
index 92b9860fbc0..561b1e5902c 100644
--- a/vendor/project_templates/rails.tar.gz
+++ b/vendor/project_templates/rails.tar.gz
Binary files differ