Merge pull request #36 in GC/basis-modul from feature/GC-176-menu-als…

…-api-entwickeln-neuer-navigation_menu to master

* commit 'd044ff13ef94e10a5592593f6db2d41436a72d10': (33 commits)
  Versionierungshinweise ud changelog
  Kommentare angepasst GC-176
  QB-425
  Merge mit cucumber Tests Branch GC 140
  Cucumber results as JSON
  Rake task for cucumber on bamboo
  Block and allow certain URLs
  Bundle update, new GEM versions
  Cucumber Results parsing to JSON
  Deletes unnecessary test/ folders
  Anpassungen fuer das Auslesen von Props
  Todo Formatierung angepasst
  Finde-aktiven-Menüpunkt Problem als TODO markiert
  ReactBugfix: class => className
  Caching wieder aktiviert
  Cache deaktivieren fuer Menu API
  Aktiviert Caching fuer NavigationsAPI
  Depth für Elemente beruecksichtigen.
  handleData Callback optimiert
  Gemanpassungen fuer die Tests. DANGER!
  ...

.gitignore

@@ -41,3 +41,5 @@ test/dummy/solr/*
 .ruby-version
 /test-reports
 rspec.xml
+test/dummy/results.json
+test/dummy/results.xml

Gemfile

@@ -11,7 +11,7 @@ gemspec
 # jquery-rails is used by the dummy application
 gem "jquery-rails"
 
-gem 'multi_json', "~> 1.3"
+gem 'multi_json'#, "~> 1.3"
 gem 'devise', "~> 2.2.4"#, :git => "http://github.com/plataformatec/devise.git"
 gem 'activeadmin', :git => "http://github.com/ikusei/active_admin.git", :require => "activeadmin"
 gem 'acts-as-taggable-on', :git => 'http://github.com/mbleigh/acts-as-taggable-on.git'
@@ -32,7 +32,7 @@ gem "paperclip"#, "= 3.0.4"
 gem 'sass-rails'
 gem 'compass-rails'
 gem 'memcache-client'
-gem 'nokogiri', '~> 1.5.3'
+gem 'nokogiri'#, '~> 1.5.3'
 # gem 'cancan', "1.6.7"
 gem 'cancan'
 #gem 'cobweb' #https://github.com/stewartmckee/cobweb
@@ -67,14 +67,14 @@ group :development do
   gem 'brakeman'
   gem 'hirb'
   gem "powder"
-  gem 'listen', '~> 2.0'
+  gem 'listen'#, '~> 2.0'
   gem 'pre-commit'
 end
 
 group :test do
   #gem 'mysql2'
   gem 'cucumber'
-  gem 'cucumber-rails'
+  gem 'cucumber-rails', git: "https://github.com/cucumber/cucumber-rails.git"
   gem 'factory_girl'
   gem "factory_girl_rails"
   gem 'database_cleaner'
@@ -86,7 +86,7 @@ group :test do
   gem 'guard-rspec'
   gem 'guard-cucumber'
   gem 'guard-livereload'
-  gem 'rb-fsevent', '~> 0.9.1'
+  gem 'rb-fsevent'#, '~> 0.9.1'
   gem 'growl'
   gem 'launchy'
   gem 'shoulda-matchers'