Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setup Netlify site for yard docs #3019

Merged
merged 6 commits into from
Jan 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
54 changes: 30 additions & 24 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,37 @@

source 'https://rubygems.org'

gemspec require: false
group :backend, :frontend, :core, :api do
gemspec require: false

rails_version = ENV['RAILS_VERSION'] || '~> 5.2.0'
gem 'rails', rails_version, require: false
rails_version = ENV['RAILS_VERSION'] || '~> 5.2.0'
gem 'rails', rails_version, require: false

platforms :ruby do
gem 'mysql2', '~> 0.5.0', require: false
gem 'pg', '~> 1.0', require: false
gem 'sqlite3', require: false
gem 'fast_sqlite', require: false
end
platforms :ruby do
case ENV['DB']
when /mysql/
gem 'mysql2', '~> 0.5.0', require: false
when /postgres/
gem 'pg', '~> 1.0', require: false
else
gem 'sqlite3', require: false
gem 'fast_sqlite', require: false
end
end

platforms :jruby do
gem 'jruby-openssl', require: false
gem 'activerecord-jdbcsqlite3-adapter', require: false
end
platforms :jruby do
gem 'jruby-openssl', require: false
gem 'activerecord-jdbcsqlite3-adapter', require: false
end

gem 'database_cleaner', '~> 1.3', require: false
gem 'factory_bot_rails', '~> 4.8', require: false
gem 'i18n-tasks', '~> 0.9', require: false
gem 'rspec-activemodel-mocks', '~>1.1', require: false
gem 'rspec-rails', '~> 3.7', require: false
gem 'simplecov', require: false
gem 'with_model', require: false
gem 'rails-controller-testing', require: false
gem 'database_cleaner', '~> 1.3', require: false
gem 'factory_bot_rails', '~> 4.8', require: false
gem 'rspec-activemodel-mocks', '~>1.1', require: false
gem 'rspec-rails', '~> 3.7', require: false
gem 'simplecov', require: false
gem 'with_model', require: false
gem 'rails-controller-testing', require: false
end

group :backend, :frontend do
gem 'capybara', '~> 2.15', require: false
Expand All @@ -44,17 +50,17 @@ group :backend do
gem 'teaspoon-mocha', require: false
end

gem 'rubocop', '~> 0.53.0', require: false

group :utils do
gem 'pry'
gem 'launchy', require: false
gem 'i18n-tasks', '~> 0.9', require: false
gem 'rubocop', '~> 0.53.0', require: false
end

gem 'rspec_junit_formatter', require: false, group: :ci

# Documentation
gem 'yard'
gem 'yard', require: false, group: :docs

custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
eval File.read(custom_gemfile) if File.exist?(custom_gemfile)
8 changes: 4 additions & 4 deletions core/app/mailers/spree/carton_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ class CartonMailer < BaseMailer
# shipped. If a carton contains items from multiple orders then this will be
# called with that carton one time for each order.
#
# @param carton [Spree::Carton] the shipped carton
# @param order [Spree::Order] one of the orders with items in the carton
# @param resend [Boolean] indicates whether the email is a 'resend' (e.g.
# triggered by the admin "resend" button)
# @option options carton [Spree::Carton] the shipped carton
# @option options order [Spree::Order] one of the orders with items in the carton
# @option options resend [Boolean] indicates whether the email is a 'resend' (e.g.
# triggered by the admin "resend" button)
# @return [Mail::Message]
#
# Note: The signature of this method has changed. The new (non-deprecated)
Expand Down
8 changes: 4 additions & 4 deletions core/app/models/spree/order_cancellations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ def initialize(order)
# @api public
#
# @param [Array<InventoryUnit>] inventory_units the inventory units to be short shipped
# @param (deprecated) [String] whodunnit the system or person that is short shipping the inventory unit
# @param [String] created_by the system or person that is short shipping the inventory unit
# @param [Spree.user_class] whodunnit (deprecated) the system or person that is short shipping the inventory unit
# @param [Spree.user_class] created_by the system or person that is short shipping the inventory unit
#
# @return [Array<UnitCancel>] the units that have been canceled due to short shipping
def short_ship(inventory_units, whodunnit: nil, created_by: nil)
Expand Down Expand Up @@ -65,8 +65,8 @@ def short_ship(inventory_units, whodunnit: nil, created_by: nil)
#
# @param [InventoryUnit] inventory_unit the inventory unit to be canceled
# @param [String] reason the reason that you are canceling the inventory unit
# @param (deprecated) [String] whodunnit the system or person that is canceling the inventory unit
# @param [String] created_by the system or person that is canceling the inventory unit
# @param [Spree.user_class] whodunnit (deprecated) the system or person that is canceling the inventory unit
# @param [Spree.user_class] created_by the system or person that is canceling the inventory unit
#
# @return [UnitCancel] the unit that has been canceled
def cancel_unit(inventory_unit, reason: Spree::UnitCancel::DEFAULT_REASON, whodunnit: nil, created_by: nil)
Expand Down
7 changes: 0 additions & 7 deletions netlify.toml

This file was deleted.