Skip to content

Commit 50fbce9

Browse files
committed
update to rails 4.2.4
1 parent 443ef52 commit 50fbce9

17 files changed

+28
-559
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0
1+
2.2.2

Gemfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
source 'https://rubygems.org'
2-
ruby '2.2.0'
3-
gem 'rails', '4.2.0'
2+
ruby '2.2.2'
3+
gem 'rails', '4.2.4'
4+
gem 'sqlite3'
45
gem 'sass-rails', '~> 5.0'
56
gem 'uglifier', '>= 1.3.0'
67
gem 'coffee-rails', '~> 4.1.0'
@@ -9,6 +10,8 @@ gem 'turbolinks'
910
gem 'jbuilder', '~> 2.0'
1011
group :development, :test do
1112
gem 'byebug'
13+
end
14+
group :development do
1215
gem 'web-console', '~> 2.0'
1316
gem 'spring'
1417
end
@@ -24,11 +27,6 @@ group :development, :test do
2427
gem 'factory_girl_rails'
2528
gem 'faker'
2629
gem 'rspec-rails'
27-
gem 'sqlite3'
28-
end
29-
group :production do
30-
gem 'pg'
31-
gem 'rails_12factor'
3230
end
3331
group :test do
3432
gem 'capybara'

Gemfile.lock

Lines changed: 0 additions & 238 deletions
This file was deleted.

README.textile

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
h1. !http://railsapps.github.io/images/rails-36x36.jpg(Rails Bootstrap)! Rails and Bootstrap
22

3-
"!https://www.herokucdn.com/deploy/button.png(Deploy to Heroku)!":https://heroku.com/deploy "!https://d3o0mnbgv6k92a.cloudfront.net/assets/hack-l-v1-3cc067e71372f6045e1949af9d96095b.png(Hack RailsApps on Nitrous.IO)!":https://www.nitrous.io/hack_button?source=embed&runtime=rails&repo=RailsApps%2Frails-bootstrap&file_to_open=nitrous.txt
4-
53
Rails 4.2 example application that integrates Rails and Bootstrap 3.3.
64

75
"Bootstrap":http://getbootstrap.com/ (formerly Twitter Bootstrap) provides CSS stylesheets and JavaScript code for the visual design of websites. Bootstrap is a framework for client-side (browser-based or “front end”) development, much like Ruby on Rails is a framework for server-side development.
@@ -181,12 +179,6 @@ h4. Troubleshooting
181179

182180
If you get an error "OpenSSL certificate verify failed" or "Gem::RemoteFetcher::FetchError: SSL_connect" see the article "OpenSSL errors and Rails":http://railsapps.github.io/openssl-certificate-verify-failed.html.
183181

184-
h3. Cloud
185-
186-
Click the button below to install the app on "Nitrous.io":https://www.nitrous.io/, a hosted development environment. Nitrous.io is free for small projects. See "Ruby on Rails with Nitrous.io":http://railsapps.github.io/rubyonrails-nitrous-io.html for more information.
187-
188-
"!https://d3o0mnbgv6k92a.cloudfront.net/assets/hack-l-v1-3cc067e71372f6045e1949af9d96095b.png(Hack RailsApps on Nitrous.IO)!":https://www.nitrous.io/hack_button?source=embed&runtime=rails&repo=RailsApps%2Frails-bootstrap&file_to_open=nitrous.txt
189-
190182
h3. Edit the README
191183

192184
If you're storing the app in a GitHub repository, please edit the README files to add a description of the app and your contact info. If you don't change the README, people will think I am the author of your version of the application.
@@ -279,15 +271,9 @@ h2. Deploy to Heroku
279271

280272
Heroku provides low cost, easily configured Rails application hosting.
281273

282-
h4. One Click Deployment
283-
284-
For one-click deployment, click the button to deploy to Heroku:
285-
286-
"!https://www.herokucdn.com/deploy/button.png(Deploy to Heroku)!":https://heroku.com/deploy
287-
288274
h4. From the Command Line
289275

290-
Alternatively, you can deploy from the command line.
276+
You can deploy from the command line.
291277

292278
<pre>
293279
$ git push origin master
@@ -362,5 +348,3 @@ h2. Useful Links
362348
| "Rails Composer":http://railsapps.github.io/rails-composer/ | "Rails Application Templates":http://railsapps.github.io/rails-application-templates.html |
363349
| "Rails Examples":http://railsapps.github.io/ | "Rails Product Planning":http://railsapps.github.io/rails-product-planning.html |
364350
| "Rails Starter Apps":http://railsapps.github.io/rails-examples-tutorials.html | "Rails Project Management":http://railsapps.github.io/rails-project-management.html |
365-
366-
!https://cruel-carlota.pagodabox.com/f339791241ba862267c8d2769a6debbf(githalytics.com alpha)!

app.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

nitrous.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.

public/assets/application-f95dc92ece35c7142095d4f1a8674eef.css

Lines changed: 0 additions & 1 deletion
This file was deleted.
-18.5 KB
Binary file not shown.

public/assets/application-fee56159849262f12af05d7925326f48.js

Lines changed: 0 additions & 5 deletions
This file was deleted.
-45.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)