summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--.travis.yml2
-rw-r--r--app/views/layouts/application.html.haml1
-rw-r--r--core/lib/leap_web_core/dependencies.rb1
-rw-r--r--core/lib/leap_web_core/ui_dependencies.rb1
-rw-r--r--help/app/views/tickets/index.html.haml5
-rw-r--r--ui_dependencies.rb1
7 files changed, 7 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index a3f0974..974d05e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,8 @@ Gemfile.lock
*/Gemfile.lock
test/dummy/log/*
test/dummy/tmp/*
+config/couchdb.yml
+public/assets/*
+public/ca.crt
+public/config/*
+public/provider.json
diff --git a/.travis.yml b/.travis.yml
index 984e24a..6b9a119 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,4 @@
services:
- couchdb
+notifications:
+ email: false
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index bd03477..e6d22f0 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -19,6 +19,5 @@
.row
.span12
= render 'layouts/messages'
- %div{"data-pjax-container" => ""}
= yield
%footer
diff --git a/core/lib/leap_web_core/dependencies.rb b/core/lib/leap_web_core/dependencies.rb
index 00ef515..7f6ca87 100644
--- a/core/lib/leap_web_core/dependencies.rb
+++ b/core/lib/leap_web_core/dependencies.rb
@@ -11,7 +11,6 @@ module LeapWebCore
"haml" => "~> 3.1.7",
"bootstrap-sass" => "~> 2.0.4",
"jquery-rails" => nil,
- "pjax_rails" => nil,
"simple_form" => nil
}
diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/core/lib/leap_web_core/ui_dependencies.rb
index 8ca9b91..e0a0b86 100644
--- a/core/lib/leap_web_core/ui_dependencies.rb
+++ b/core/lib/leap_web_core/ui_dependencies.rb
@@ -2,7 +2,6 @@ require "haml"
require "bootstrap-sass"
require "jquery-rails"
require "simple_form"
-require "pjax_rails"
if Rails.env == "development"
require "haml-rails"
diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml
index fdbeec5..23a503d 100644
--- a/help/app/views/tickets/index.html.haml
+++ b/help/app/views/tickets/index.html.haml
@@ -15,8 +15,3 @@ Create a
= render @tickets.all
= paginate @tickets
-%div{"data-pjax-container" => ""}
- / PJAX updates will go here
- hmmm
-
-
diff --git a/ui_dependencies.rb b/ui_dependencies.rb
index 10eac67..c0779c0 100644
--- a/ui_dependencies.rb
+++ b/ui_dependencies.rb
@@ -2,7 +2,6 @@ gem "haml", "~> 3.1.7"
gem "bootstrap-sass", "~> 2.1.0"
gem "jquery-rails"
gem "simple_form"
-gem "pjax_rails"
gem 'client_side_validations'
gem 'client_side_validations-simple_form'
gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be issues with 0.14.0 when using couchrest