Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master' into v/5.0-staging

  • Loading branch information
nimaai committed Apr 3, 2019
2 parents c1726fb + 11fe4cd commit 9ba835f201fdcfe0ee0797667c01c9d3d09f31e6
Showing with 9 additions and 9 deletions.
  1. +1 −1 admin
  2. +1 −1 cider-ci/task-components/zhdk-test-deploy.yml
  3. +1 −1 database
  4. +1 −1 deploy
  5. +1 −1 documentation
  6. +1 −1 integration-tests
  7. +1 −1 legacy
  8. +1 −1 my
  9. +1 −1 procure
2 admin
Submodule admin updated 2 files
+1 −1 database
+1 −1 leihs-ui
@@ -10,7 +10,7 @@ scripts:
-i ../zhdk-inventory/prod-hosts-v5
restore-dump:
timeout: 20 Minutes
timeout: 15 Minutes
start_when:
fetch passed:
script_key: fetch-dump
2 deploy
Submodule integration-tests updated 38 files
+1 −1 Gemfile
+8 −33 Gemfile.lock
+1 −0 README.md
+0 −2 cider-ci.yml
+0 −7 cider-ci/bin/push-to-relish
+0 −49 cider-ci/push-to-relish.yml
+17 −0 spec/config/database.rb
+14 −0 spec/config/metadata_extractor.rb
+8 −0 spec/factories/building.rb
+2 −0 spec/factories/procurement_admin.rb
+19 −0 spec/factories/procurement_attachment.rb
+25 −0 spec/factories/procurement_budget_period.rb
+10 −0 spec/factories/procurement_category.rb
+4 −0 spec/factories/procurement_inspector.rb
+8 −0 spec/factories/procurement_main_category.rb
+5 −0 spec/factories/procurement_organization.rb
+24 −0 spec/factories/procurement_request.rb
+4 −1 spec/factories/procurement_requester.rb
+13 −0 spec/factories/procurement_settings.rb
+4 −0 spec/factories/procurement_viewer.rb
+8 −0 spec/factories/room.rb
+11 −0 spec/factories/supplier.rb
+7 −0 spec/factories/user.rb
+75 −0 spec/features/procure/request/admin_crud.feature
+214 −0 spec/features/procure/request/inspector_crud.feature
+37 −0 spec/features/procure/request/inspector_crud.steps.rb
+136 −0 spec/features/procure/request/requester_crud.feature
+218 −0 spec/features/procure/request/shared/crud.steps.rb
+351 −0 spec/features/procure/requests_filters/advanced_user_filters.feature
+33 −0 spec/features/procure/requests_filters/advanced_user_filters.steps.rb
+224 −0 spec/features/procure/requests_filters/requester_filters.feature
+69 −0 spec/features/procure/requests_filters/shared/requests_filters.steps.rb
+176 −0 spec/features/procure/shared/procure.steps.rb
+ spec/files/lisp-machine.jpg
+ spec/files/secd.pdf
+8 −0 spec/shared/common.steps.rb
+17 −0 spec/shared/factories.steps.rb
+28 −4 spec/spec_helper.rb
2 legacy
Submodule legacy updated 51 files
+0 −1 Gemfile
+0 −15 Gemfile.lock
+4 −0 app/assets/javascripts/i18n/locale/de-CH.js
+1 −0 app/assets/javascripts/manage/controllers/reservations/reservations_assign_item_controller.coffee
+2 −2 app/controllers/attachments_controller.rb
+11 −0 app/controllers/borrow/customer_orders_controller.rb
+13 −0 app/controllers/borrow/reservations_controller.rb
+2 −2 app/javascript/components/borrow_booking_calendar/BorrowBookingCalendar.js
+63 −55 app/models/availability/main.rb
+8 −7 app/models/inventory_pool.rb
+1 −25 app/models/model.rb
+3 −0 app/views/borrow/inventory_pools/index.html.haml
+10 −1 app/views/manage/models/old_timeline.html.haml
+1 −1 bin/fetch-and-restore-prod-dump
+0 −4 bin/precompile-and-amend-assets
+5 −0 bin/recompile-assets
+0 −2 cider-ci.yml
+0 −10 cider-ci/bin/push-to-relish
+28 −3 cider-ci/jobs/meta.yml
+0 −49 cider-ci/jobs/push-to-relish.yml
+0 −2 cider-ci/shared/flapping-context-configuration.yml
+0 −3 cider-ci/shared/main-context.yml
+32 −0 cider-ci/tasks/borrow-rspec-scenarios.yml
+1 −1 database
+0 −1 engines/leihs_admin/Gemfile
+0 −28 engines/leihs_admin/Gemfile.lock
+0 −1 factories/model_factory.rb
+ features/personas/demo.pgbin
+ features/personas/personas.pgbin
+4 −4 features/step_definitions/group_steps.rb
+4 −0 locale/de_CH/leihs.po
+3 −0 locale/leihs.pot
+1 −1 public/assets
+ secrets/agw_info_prod.rb
+ secrets/agw_info_test.rb
+ secrets/relish
+28 −0 spec/features/availability_example.feature
+20 −0 spec/features/borrow/booking_calendar.feature
+14 −0 spec/features/borrow/inventory_pools.feature
+1 −1 spec/features/borrow/order_mails.feature
+24 −1 spec/features/borrow/submit_order.feature
+45 −0 spec/steps/availability_example_steps.rb
+58 −0 spec/steps/borrow/booking_calendar_steps.rb
+1 −1 spec/steps/borrow/order_mail_steps.rb
+27 −1 spec/steps/borrow/submit_order_steps.rb
+0 −37 spec/steps/current_order_steps.rb
+0 −8 spec/steps/manage/hand_over_steps.rb
+0 −4 spec/steps/manage/serial_number_validation_steps.rb
+0 −4 spec/steps/manage/take_back_steps.rb
+13 −0 spec/steps/shared/common_steps.rb
+10 −0 spec/steps/shared/factory_steps.rb
2 my
Submodule my updated 2 files
+1 −1 database
+1 −1 leihs-ui

0 comments on commit 9ba835f

Please sign in to comment.
You can’t perform that action at this time.