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.

Sign up for GitHub

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

Jump to bottom

Spree compatible #2211

Merged
merged 10 commits into from
Mar 8, 2013
Merged

Spree compatible #2211

merged 10 commits into from
Mar 8, 2013

Conversation

rounders
Copy link
Contributor

@rounders rounders commented Mar 8, 2013

update refinery to be compatible with spree. fixes issue #2202

parndt
parndt reviewed Mar 8, 2013
View reviewed changes
core/vendor/assets/javascripts/jquery/jquery.corner.js
@@ -1,7 +1,7 @@
/*!
* jQuery corner plugin: simple corner rounding
* Examples and documentation at: http://jquery.malsup.com/corner/
* version 2.11 (15-JUN-2010)
* version 2.13 (19-FEB-2013)
Copy link
Member

Choose a reason for hiding this comment

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

oh yay a new version!

parndt added a commit that referenced this pull request Mar 8, 2013
@parndt
Merge pull request #2211 from rounders/spree-compatible
a9ea150 
Spree compatible
@parndt parndt merged commit a9ea150 into refinery:master Mar 8, 2013
@parndt
Copy link
Member

parndt commented Mar 8, 2013

Merged thanks!

@parndt
Copy link
Member

parndt commented Mar 8, 2013

❤️

This was referenced Mar 8, 2013
Closed
Closed
Closed
Closed
@brendonrapp
Copy link

I am still having problems with this.

Bundler could not find compatible versions for gem "jquery-rails":
  In Gemfile:
    refinerycms-core (= 2.0.10) ruby depends on
      jquery-rails (~> 2.0.0) ruby

    spree (~> 1.2.4) ruby depends on
      jquery-rails (2.1.4)

@ugisozols
Copy link
Member

This was only merged in master so 2-0-stable still depends on jquery-rails ~> 2.0.0 and I'm not sure it's safe to backport a9ea150 to 2-0-stable. @parndt WDYT?

@parndt
Copy link
Member

parndt commented Jun 12, 2013

Not safe

On Thursday, 13 June at 8:51 AM Uģis Ozols wrote:

This was only merged in master so 2-0-stable still depends on jquery-rails ~> 2.0.0 and I'm not sure it's safe to backport a9ea150 to 2-0-stable. @parndt WDYT?

Reply to this email directly or view it on GitHub:
#2211 (comment)

@brendonrapp
Copy link

Understood, thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rounders @parndt @brendonrapp @ugisozols @scambra