Revert "Merge remote-tracking branch 'upstream/master' into no_db_tmp"

This reverts commit 8e297d7, reversing
changes made to d146ee5.

.gitignore

@@ -7,7 +7,6 @@ diff.diff
 .*.sw*
 .DS_Store
 .idea
-.directory
 
 # Bundler config
 /.bundle
@@ -22,14 +21,18 @@ public/assets
 public/developer
 public/developer.html
 public/developer2
-public/images
 public/index.html
 public/package
 
 # Logfiles and temfiles
 /log/*.log
 /tmp
 
+# Configuration files
+config/options.yml
+config/database.yml
+config/secrets.yml
+
 # i18n
 locale/*/software.edit.po
 locale/*/software.po.time_stamp

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "public/chameleon"]
-	path = public/chameleon
-	url = https://github.com/openSUSE/opensuse-theme-chameleon.git
+[submodule "public/themes"]
+	path = public/themes
+	url = git://github.com/openSUSE/opensuse-themes.git

Gemfile

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2.8'
+gem 'rails', '~> 4.1.1'
 gem 'nokogiri'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.0'
 # With compass
-gem 'compass-rails', '~> 2.0.0'
+gem 'compass-rails', '< 2.0'
+gem 'compass', '< 1.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
@@ -22,13 +23,6 @@ gem 'fast_gettext', '>= 0.7.0'
 # validation error messages
 gem 'rails-i18n'
 
-gem 'xmlhash', '>= 1.2.2'
-gem 'hashie'
-gem 'dalli'
-gem 'minitest'
-gem 'hoptoad_notifier', "~> 2.3"
-gem 'mini_magick'
-
 # needed to collect translatable strings
 # not needed at production
 group :development do
@@ -37,13 +31,38 @@ group :development do
   gem 'gettext', '>= 1.9.3', :require => false
 end
 
-group :production do
-  gem 'puma'
-end
+# MySQL is not used, as far as I know
+gem 'mysql2', '~> 0.3.1'
+
+gem 'xmlhash', '>= 1.2.2'
+
+#gem 'memcache-client'
+gem 'dalli'
+gem 'sqlite3'
+gem 'minitest'
+gem 'hoptoad_notifier', "~> 2.3"
+gem 'mini_magick'
+#gem 'actionpack-page_caching'
+#gem 'actionpack-action_caching'
 
 group :test do
+# This doesn't work because capybara-webkit (~> 1.1.1) depends on
+# capybara (< 2.2.0, >= 2.0.2) ruby
+#  gem 'capybara', '~>2.2.1'
+#  gem 'capybara-webkit', '~>1.1.1'
+# This 'bundles' but does not work (incompatibility)
+#  gem 'capybara', '~>2.2.1'
+#  gem 'capybara-webkit', '< 1.0'
+# And this (the only working solution) cannot by installed because capybara-webkit (~> 1.1.1)
+# requires 'websocket (~> 1.0.4)' but rubygem-websocket-1_0_7 requires ruby(abi) = 2.0.0
+#  gem 'capybara', '~>2.0.3'
+#  gem 'capybara-webkit', '~>1.1.1'
   gem 'capybara'
   gem 'poltergeist'
+
   gem 'webmock'
+
   gem 'rubocop', ">= 0.47"
 end
+
+# gem 'capistrano', '~> 2.13'