one git repo to rule them all\!

2015-01-22 06:38:48 +01:00
parent c003584f7e
commit 23a6fda854
149 changed files with 967 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,47 @@
 #   git config --global core.excludesfile '~/.gitignore_global'
 # Ignore bundler config.
-/.bundle
+/ribica-back-office/.bundle
 # Ignore all logfiles and tempfiles.
-/log/*
+/ribica-back-office/log/*
-!/log/.keep
+!/ribica-back-office/log/.keep
-/tmp
+/ribica-back-office/tmp
 *.gem
 *.rbc
 /ribica-front-api/.config
 /ribica-front-api/coverage/
 /ribica-front-api/InstalledFiles
 /ribica-front-api/pkg/
 /ribica-front-api/spec/reports/
 /ribica-front-api/test/tmp/
 /ribica-front-api/test/version_tmp/
 /ribica-front-api/tmp/
 ## Specific to RubyMotion:
 .dat*
 .repl_history
 build/
 ## Documentation cache and generated files:
 /ribica-front-api/.yardoc/
 /ribica-front-api/_yardoc/
 /ribica-front-api/doc/
 /ribica-front-api/rdoc/
 ## Environment normalisation:
 /ribica-front-api/.bundle/
 /ribica-front-api/lib/bundler/man/
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
 # Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 # everyone has it's own configuration :)
 config.rb
--- a/ribica-back-office/Gemfile
+++ b/ribica-back-office/Gemfile
--- a/ribica-back-office/Gemfile.lock
+++ b/ribica-back-office/Gemfile.lock
--- a/ribica-back-office/README.md
+++ b/ribica-back-office/README.md
--- a/ribica-back-office/Rakefile
+++ b/ribica-back-office/Rakefile
--- a/ribica-back-office/app/assets/images/.keep
+++ b/ribica-back-office/app/assets/images/.keep
--- a/ribica-back-office/app/assets/javascripts/application.js
+++ b/ribica-back-office/app/assets/javascripts/application.js
--- a/ribica-back-office/app/assets/stylesheets/application.css
+++ b/ribica-back-office/app/assets/stylesheets/application.css
--- a/ribica-back-office/app/controllers/application_controller.rb
+++ b/ribica-back-office/app/controllers/application_controller.rb
--- a/ribica-back-office/app/controllers/categories_controller.rb
+++ b/ribica-back-office/app/controllers/categories_controller.rb
--- a/ribica-back-office/app/controllers/concerns/.keep
+++ b/ribica-back-office/app/controllers/concerns/.keep
--- a/ribica-back-office/app/controllers/items_controller.rb
+++ b/ribica-back-office/app/controllers/items_controller.rb
--- a/ribica-back-office/app/controllers/media_types_controller.rb
+++ b/ribica-back-office/app/controllers/media_types_controller.rb
--- a/ribica-back-office/app/controllers/multi_media_descriptions_controller.rb
+++ b/ribica-back-office/app/controllers/multi_media_descriptions_controller.rb
--- a/ribica-back-office/app/controllers/sections_controller.rb
+++ b/ribica-back-office/app/controllers/sections_controller.rb
--- a/ribica-back-office/app/controllers/sub_categories_controller.rb
+++ b/ribica-back-office/app/controllers/sub_categories_controller.rb
--- a/ribica-back-office/app/controllers/units_controller.rb
+++ b/ribica-back-office/app/controllers/units_controller.rb
--- a/ribica-back-office/app/helpers/application_helper.rb
+++ b/ribica-back-office/app/helpers/application_helper.rb
--- a/ribica-back-office/app/helpers/categories_helper.rb
+++ b/ribica-back-office/app/helpers/categories_helper.rb
--- a/ribica-back-office/app/helpers/items_helper.rb
+++ b/ribica-back-office/app/helpers/items_helper.rb
--- a/ribica-back-office/app/helpers/media_types_helper.rb
+++ b/ribica-back-office/app/helpers/media_types_helper.rb
--- a/ribica-back-office/app/helpers/multi_media_descriptions_helper.rb
+++ b/ribica-back-office/app/helpers/multi_media_descriptions_helper.rb
--- a/ribica-back-office/app/helpers/sections_helper.rb
+++ b/ribica-back-office/app/helpers/sections_helper.rb
--- a/ribica-back-office/app/helpers/sub_categories_helper.rb
+++ b/ribica-back-office/app/helpers/sub_categories_helper.rb
--- a/ribica-back-office/app/helpers/units_helper.rb
+++ b/ribica-back-office/app/helpers/units_helper.rb
--- a/ribica-back-office/app/mailers/.keep
+++ b/ribica-back-office/app/mailers/.keep
--- a/ribica-back-office/app/models/.keep
+++ b/ribica-back-office/app/models/.keep
--- a/ribica-back-office/app/models/category.rb
+++ b/ribica-back-office/app/models/category.rb
--- a/ribica-back-office/app/models/concerns/.keep
+++ b/ribica-back-office/app/models/concerns/.keep
--- a/ribica-back-office/app/models/item.rb
+++ b/ribica-back-office/app/models/item.rb
--- a/ribica-back-office/app/models/media_type.rb
+++ b/ribica-back-office/app/models/media_type.rb
--- a/ribica-back-office/app/models/multi_media_description.rb
+++ b/ribica-back-office/app/models/multi_media_description.rb
--- a/ribica-back-office/app/models/section.rb
+++ b/ribica-back-office/app/models/section.rb
--- a/ribica-back-office/app/models/sub_category.rb
+++ b/ribica-back-office/app/models/sub_category.rb
--- a/ribica-back-office/app/models/unit.rb
+++ b/ribica-back-office/app/models/unit.rb
--- a/ribica-back-office/app/views/layouts/application.html.erb
+++ b/ribica-back-office/app/views/layouts/application.html.erb
--- a/ribica-back-office/bin/bundle
+++ b/ribica-back-office/bin/bundle
--- a/ribica-back-office/bin/rails
+++ b/ribica-back-office/bin/rails
--- a/ribica-back-office/bin/rake
+++ b/ribica-back-office/bin/rake
--- a/ribica-back-office/bin/setup
+++ b/ribica-back-office/bin/setup
--- a/ribica-back-office/bin/spring
+++ b/ribica-back-office/bin/spring
--- a/ribica-back-office/config.ru
+++ b/ribica-back-office/config.ru
--- a/ribica-back-office/config/application.rb
+++ b/ribica-back-office/config/application.rb
--- a/ribica-back-office/config/boot.rb
+++ b/ribica-back-office/config/boot.rb
--- a/ribica-back-office/config/cloudinary.yml
+++ b/ribica-back-office/config/cloudinary.yml
--- a/ribica-back-office/config/database.yml
+++ b/ribica-back-office/config/database.yml
--- a/ribica-back-office/config/environment.rb
+++ b/ribica-back-office/config/environment.rb
--- a/ribica-back-office/config/environments/development.rb
+++ b/ribica-back-office/config/environments/development.rb
--- a/ribica-back-office/config/environments/production.rb
+++ b/ribica-back-office/config/environments/production.rb
--- a/ribica-back-office/config/environments/test.rb
+++ b/ribica-back-office/config/environments/test.rb
--- a/ribica-back-office/config/initializers/assets.rb
+++ b/ribica-back-office/config/initializers/assets.rb
--- a/ribica-back-office/config/initializers/backtrace_silencers.rb
+++ b/ribica-back-office/config/initializers/backtrace_silencers.rb
--- a/ribica-back-office/config/initializers/cookies_serializer.rb
+++ b/ribica-back-office/config/initializers/cookies_serializer.rb
--- a/ribica-back-office/config/initializers/filter_parameter_logging.rb
+++ b/ribica-back-office/config/initializers/filter_parameter_logging.rb
--- a/ribica-back-office/config/initializers/inflections.rb
+++ b/ribica-back-office/config/initializers/inflections.rb
--- a/ribica-back-office/config/initializers/mime_types.rb
+++ b/ribica-back-office/config/initializers/mime_types.rb
--- a/ribica-back-office/config/initializers/session_store.rb
+++ b/ribica-back-office/config/initializers/session_store.rb
--- a/ribica-back-office/config/initializers/wrap_parameters.rb
+++ b/ribica-back-office/config/initializers/wrap_parameters.rb
--- a/ribica-back-office/config/locales/en.yml
+++ b/ribica-back-office/config/locales/en.yml
--- a/ribica-back-office/config/routes.rb
+++ b/ribica-back-office/config/routes.rb
--- a/ribica-back-office/config/secrets.yml
+++ b/ribica-back-office/config/secrets.yml
--- a/ribica-back-office/db/seeds.rb
+++ b/ribica-back-office/db/seeds.rb
--- a/ribica-back-office/lib/assets/.keep
+++ b/ribica-back-office/lib/assets/.keep
--- a/ribica-back-office/lib/tasks/.keep
+++ b/ribica-back-office/lib/tasks/.keep
--- a/ribica-back-office/log/.keep
+++ b/ribica-back-office/log/.keep
--- a/ribica-back-office/public/404.html
+++ b/ribica-back-office/public/404.html
--- a/ribica-back-office/public/422.html
+++ b/ribica-back-office/public/422.html
--- a/ribica-back-office/public/500.html
+++ b/ribica-back-office/public/500.html
--- a/ribica-back-office/public/favicon.ico
+++ b/ribica-back-office/public/favicon.ico
--- a/ribica-back-office/public/robots.txt
+++ b/ribica-back-office/public/robots.txt
--- a/ribica-back-office/test/controllers/.keep
+++ b/ribica-back-office/test/controllers/.keep
--- a/ribica-back-office/test/controllers/categories_controller_test.rb
+++ b/ribica-back-office/test/controllers/categories_controller_test.rb
--- a/ribica-back-office/test/controllers/items_controller_test.rb
+++ b/ribica-back-office/test/controllers/items_controller_test.rb
--- a/ribica-back-office/test/controllers/media_types_controller_test.rb
+++ b/ribica-back-office/test/controllers/media_types_controller_test.rb
--- a/ribica-back-office/test/controllers/multi_media_descriptions_controller_test.rb
+++ b/ribica-back-office/test/controllers/multi_media_descriptions_controller_test.rb
--- a/ribica-back-office/test/controllers/sections_controller_test.rb
+++ b/ribica-back-office/test/controllers/sections_controller_test.rb
--- a/ribica-back-office/test/controllers/sub_categories_controller_test.rb
+++ b/ribica-back-office/test/controllers/sub_categories_controller_test.rb
--- a/ribica-back-office/test/controllers/units_controller_test.rb
+++ b/ribica-back-office/test/controllers/units_controller_test.rb
--- a/ribica-back-office/test/fixtures/.keep
+++ b/ribica-back-office/test/fixtures/.keep
--- a/ribica-back-office/test/fixtures/categories.yml
+++ b/ribica-back-office/test/fixtures/categories.yml
--- a/ribica-back-office/test/fixtures/items.yml
+++ b/ribica-back-office/test/fixtures/items.yml
--- a/ribica-back-office/test/fixtures/media_types.yml
+++ b/ribica-back-office/test/fixtures/media_types.yml
--- a/ribica-back-office/test/fixtures/multi_media_descriptions.yml
+++ b/ribica-back-office/test/fixtures/multi_media_descriptions.yml
--- a/ribica-back-office/test/fixtures/sections.yml
+++ b/ribica-back-office/test/fixtures/sections.yml
--- a/ribica-back-office/test/fixtures/sub_categories.yml
+++ b/ribica-back-office/test/fixtures/sub_categories.yml
--- a/ribica-back-office/test/fixtures/units.yml
+++ b/ribica-back-office/test/fixtures/units.yml
--- a/ribica-back-office/test/helpers/.keep
+++ b/ribica-back-office/test/helpers/.keep
--- a/ribica-back-office/test/integration/.keep
+++ b/ribica-back-office/test/integration/.keep
--- a/ribica-back-office/test/mailers/.keep
+++ b/ribica-back-office/test/mailers/.keep
--- a/ribica-back-office/test/models/.keep
+++ b/ribica-back-office/test/models/.keep
--- a/ribica-back-office/test/models/category_test.rb
+++ b/ribica-back-office/test/models/category_test.rb
--- a/ribica-back-office/test/models/item_test.rb
+++ b/ribica-back-office/test/models/item_test.rb
--- a/ribica-back-office/test/models/media_type_test.rb
+++ b/ribica-back-office/test/models/media_type_test.rb
--- a/ribica-back-office/test/models/multi_media_description_test.rb
+++ b/ribica-back-office/test/models/multi_media_description_test.rb
--- a/ribica-back-office/test/models/section_test.rb
+++ b/ribica-back-office/test/models/section_test.rb
--- a/ribica-back-office/test/models/sub_category_test.rb
+++ b/ribica-back-office/test/models/sub_category_test.rb
--- a/ribica-back-office/test/models/unit_test.rb
+++ b/ribica-back-office/test/models/unit_test.rb
--- a/ribica-back-office/test/test_helper.rb
+++ b/ribica-back-office/test/test_helper.rb
--- a/ribica-back-office/vendor/assets/javascripts/.keep
+++ b/ribica-back-office/vendor/assets/javascripts/.keep
--- a/ribica-back-office/vendor/assets/stylesheets/.keep
+++ b/ribica-back-office/vendor/assets/stylesheets/.keep
--- a/Show More
+++ b/Show More