merge with master

2016-08-03 12:09:58 +02:00
parent d921f90a65 81b3299917
commit 4183a16178
77 changed files with 770 additions and 515 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -198,6 +198,8 @@ GEM
    pundit (1.1.0)
      activesupport (>= 3.0.0)
    rack (1.5.5)
+    rack-mini-profiler (0.10.1)
+      rack (>= 1.2.0)
    rack-test (0.6.3)
      rack (>= 1.0)
    rails (4.1.14.1)
@@ -387,6 +389,7 @@ DEPENDENCIES
  pry-byebug
  puma (~> 2.15.3)
  pundit
+  rack-mini-profiler
  rails (~> 4.1.13)
  rails-i18n (~> 4.0.0)
  rake
@@ -397,6 +400,7 @@ DEPENDENCIES
  rubocop
  rubocop-rspec
  rubytree
+  rubyzip
  sass-rails (~> 4.0.3)
  sdoc (~> 0.4.0)
  selenium-webdriver