Skip to content

Conversation

tvdeyen
Copy link
Member

@tvdeyen tvdeyen commented Nov 7, 2014

This pull request shall only be merged after rails 4.2 was released and rails/rails#17453 gets solved. I just opened it so we can run tests on travis.

This branch will be regularly updated and finally merged into master after Rails 4.2 got released.

@tvdeyen tvdeyen added this to the 3.1 milestone Nov 7, 2014
@tvdeyen tvdeyen self-assigned this Nov 7, 2014
@tvdeyen tvdeyen removed this from the 3.1 milestone Nov 24, 2014
Conflicts:
	app/controllers/alchemy/contents_controller.rb
	spec/libraries/resource_spec.rb
@gabrielrios
Copy link

Rails 4.2 was released on Dec 19th, any news on this?

Thomas von Deyen added 4 commits December 22, 2014 22:31
Conflicts:
	app/controllers/alchemy/pages_controller.rb
To hvae respond_to and respond_with back.
The JSON api moved into it's own namespace.
@tvdeyen
Copy link
Member Author

tvdeyen commented Dec 23, 2014

The tests are passing now. But we have a lots of deprecations I would like to address before we merge this.

@gabrielrios please test the rails-4.2 branch in your app and report any regression you may find. Update your Gemfile

gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'rails-4.2'

And run bundle update alchemy_cms

Thanks and merry Christmas 🎄

@joho
Copy link

joho commented Jan 28, 2015

Hey there - we're in the process of evaluating alchemy to integrate with a new app we've got at work. Just wondering where this PR fits in terms of priority as it'd be nice to drop a stable version into our 4.2 app.

@tvdeyen
Copy link
Member Author

tvdeyen commented Jan 28, 2015

Our first priority is to release 3.1 (currently in rc1). Then we concentrate on Rails 4.2 for a 3.2 release.

Please try the rails-4.2 branch in your app and report any Feedback. I will merge the master into that in a minute. So besides any Rails 4.2 related stuff this can be considered stable.

That would be very helpful to get the 3.2 release soon.

Thanks

Conflicts:
	.travis.yml
	alchemy_cms.gemspec
	spec/dummy/config/application.rb
	spec/dummy/config/environments/test.rb
@tvdeyen tvdeyen modified the milestone: 3.2 Jan 28, 2015
Ruby 1.9 is deprecated and support ends in mid 2015.

There is **no reason** to not use Ruby 2.x
@tvdeyen
Copy link
Member Author

tvdeyen commented Jan 28, 2015

@joho I updated the branch, tests all pass \o/

It would be nice if you could test this in your Rails 4.2 app:

gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'rails-4.2'

and report any regressions here.

Thomas von Deyen added 2 commits January 28, 2015 21:26
Default Rails 4.2 apps depend on sass-rails 5.0
@afdev82
Copy link
Contributor

afdev82 commented Jan 29, 2015

There are some problems with the backend interface after the update:

alchemy cms - images 2015-01-29 12-47-10

alchemy cms - index 2015-01-29 12-43-51

Tags inside the editor popup in the picture library:
alchemy cms - images 2015-01-29 12-46-19

@tvdeyen
Copy link
Member Author

tvdeyen commented Jan 29, 2015

Yes. Encountered these as well. I guess this is an sass issue after upgrading to sass-rails 5.0.

We need to require it in the manifest file, since the sass file is imported via sass import statement what's not working anymore for sass-rails 5.0.

Also see: jquery-ui-rails/jquery-ui-rails#89 (comment)
@tvdeyen
Copy link
Member Author

tvdeyen commented Feb 2, 2015

@afdev82 this should be fixed now. Could you please try again with current rails-4.2 branch?

@afdev82
Copy link
Contributor

afdev82 commented Feb 3, 2015

Thanks, this fixes the problems above.

@vmoravec
Copy link

I found one issue: the line at bin/alchemy#L3 needs to be changed to gem 'rails', '~> 4.2.0', otherwise it whines with Could not find 'rails' (~> 4.1.0) - did find: [rails-4.2.0]

Choose a reason for hiding this comment

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

Line is too long. [85/80]

@tvdeyen
Copy link
Member Author

tvdeyen commented Feb 18, 2015

@vmoravec fixed the rails version. Thanks for reporting 👍

@tvdeyen tvdeyen merged commit cacb00e into master Feb 20, 2015
@tvdeyen tvdeyen deleted the rails-4.2 branch February 20, 2015 10:02
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.

6 participants