summaryrefslogtreecommitdiff
path: root/db/migrate
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-09-18 09:24:15 +0000
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-09-18 09:24:15 +0000
commit1eb3dde45b55afb723954e577b7bd12946aeb3ca (patch)
treed9ad4c068767c22549badee05a06d639330973e6 /db/migrate
parentd272682a1534020a9060767e922ddb02ab075c8b (diff)
parentfe17a236e37c2d7504925a474a716f714f160b2d (diff)
downloadgitlab-ce-1eb3dde45b55afb723954e577b7bd12946aeb3ca.tar.gz
Merge branch 'add-custom-text-to-help' into 'master'
Allow custom info to be added to Help page Fixes #2536 **Admin screen** ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e62f3e0ff40558fb955f09e469293521/image.png) **Text on the Help page** ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/ba315fb418e1698d8f44b88c7cc6c29a/image.png) /cc @DouweM See merge request !1309
Diffstat (limited to 'db/migrate')
-rw-r--r--db/migrate/20150916114643_add_help_page_text_to_application_settings.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/db/migrate/20150916114643_add_help_page_text_to_application_settings.rb b/db/migrate/20150916114643_add_help_page_text_to_application_settings.rb
new file mode 100644
index 00000000000..37a27f11935
--- /dev/null
+++ b/db/migrate/20150916114643_add_help_page_text_to_application_settings.rb
@@ -0,0 +1,5 @@
+class AddHelpPageTextToApplicationSettings < ActiveRecord::Migration
+ def change
+ add_column :application_settings, :help_page_text, :text
+ end
+end