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

Upgrade master branch #244

Merged
merged 3 commits into from Feb 25, 2016
Merged

Conversation

tanmay3011
Copy link
Contributor

  1. Bump rspec-activemodel-mocks, rspec-rails and sass-rails versions.
  2. Remove patch of rspec-activemodel-mocks since its fix is already merged.
  3. Update ruby syntax.

Above changes are made against the master branch.

@tanmay3011 tanmay3011 changed the title Upgrade Upgrade master branch Feb 19, 2016
@preferences_USPS = [:usps_login, :usps_commercial_base, :usps_commercial_plus]
@preferences_CanadaPost = [:canada_post_login]
@preferences_GeneralSettings = [:units, :unit_multiplier, :default_weight, :handling_fee,
@preferences_UPS = [:ups_login, :ups_password, :ups_key, :shipper_number]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't add those spaces.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Mafi88 Okay will fix that.

@tanmay3011
Copy link
Contributor Author

@Mafi88 Extra spaces removed.

damianlegawiec added a commit that referenced this pull request Feb 25, 2016
@damianlegawiec damianlegawiec merged commit de05b53 into spree-contrib:master Feb 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants