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

Bump SaaS Rails to 4.2.4 #237

Merged
merged 3 commits into from
Mar 16, 2016
Merged

Bump SaaS Rails to 4.2.4 #237

merged 3 commits into from
Mar 16, 2016

Conversation

dahlbyk
Copy link
Member

@dahlbyk dahlbyk commented Mar 15, 2016

I didn't realize we have 2 × Gemfile.lock. As we did with #217, pulling the SaaS Rails dependency version bump out of #211 to be deployed independently.

In addition to the Rails bump, I've synchronized a few other version mismatches relative to the root Gemfile.lock.

@dahlbyk dahlbyk mentioned this pull request Mar 15, 2016
4 tasks
@dahlbyk dahlbyk deployed to huboard-rails-pr-237 March 15, 2016 15:16 Active
@discorick
Copy link
Member

Are changes in 1eadbaf out of band changes to the Gemfile.lock?

@dahlbyk
Copy link
Member Author

dahlbyk commented Mar 15, 2016

Are changes in 1eadbaf out of band changes to the Gemfile.lock?

Syncing versions changed elsewhere, yes (e.g. json version was bumped in 2cec97f).

Why do we even have a second Gemfile under SaaS?

@dahlbyk dahlbyk deployed to huboard-rails-pr-237 March 15, 2016 20:36 Active
@discorick
Copy link
Member

I wouldn't make any changes to the lock file - it will just rewrite itself as soon as anyone runs a 'bundle'. As a rule of thumb Gemfile.lock's should never be directly altered.

Why do we even have a second Gemfile under SaaS?

Technically a Rails engine is a self-contained Rails application that is injected like a Gem.

@dahlbyk
Copy link
Member Author

dahlbyk commented Mar 16, 2016

Also, while we're fiddling with versions, I just pushed a tweak to bower.json to avoid emberjs/ember.js#12787.

I wouldn't make any changes to the lock file - it will just rewrite itself as soon as anyone runs a 'bundle'. As a rule of thumb Gemfile.lock's should never be directly altered.

FWIW, if I revert my Gemfile.lock changes (but leave the gemspec change), a bundle install reverts exactly to what I am committing here. It seems I got to it the wrong way, but arrived at correct results. 😀

@discorick
Copy link
Member

Ok haha then I support!

discorick added a commit that referenced this pull request Mar 16, 2016
@discorick discorick merged commit b3fae95 into master Mar 16, 2016
@discorick discorick deleted the saas-rails-4.2.4 branch March 16, 2016 01:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants