summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluca-marie <ml.kochsiek@fu-berlin.de>2016-08-26 18:02:55 +0200
committerthea <ta.kupler@gmail.com>2016-09-01 12:09:37 +0200
commite3af6664f997d4dff227fdcd0246eff516520e96 (patch)
treeda782025fbec85badeda1b15115cf405ba93b885
parent62fb9ec13d2a34e152e270c3bdbf86766eb10373 (diff)
Adding config/config.yml file into .gitignore, cleaning up smaller typos
-rw-r--r--.gitignore2
-rw-r--r--app/views/home/_content.html.haml10
-rw-r--r--app/views/home/index.html.haml1
3 files changed, 6 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 54547f7..f898d47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,7 @@ public/assets/*
public/ca.crt
public/config/*
public/provider.json
-# config/config.yml
+config/config.yml
config/secrets.yml
public/1/*
vendor/bundle/*
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 6efd2d0..a299295 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -8,8 +8,8 @@
.col-md-3
= render 'twitter/index'
- - if Rails.env == 'development'
- .row
- %hr
- %p
-= link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
+ - if Rails.env == 'development'
+ .row
+ %hr
+ %p
+ = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 7f07460..5e33e62 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -3,7 +3,6 @@
#main
.container-fluid
= render 'home/content'
-
#push
-# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
#footer