From cf733bce5e14f42f0bf4c91b00fa0de9aadc1cfb Mon Sep 17 00:00:00 2001 From: Pavel Pravosud Date: Sat, 4 May 2013 13:46:01 +0700 Subject: Relaxed jbuilder dependency in Gemfile template --- guides/code/getting_started/Gemfile | 2 +- guides/code/getting_started/Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'guides/code') diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile index b355c7d91a..dca00b43cd 100644 --- a/guides/code/getting_started/Gemfile +++ b/guides/code/getting_started/Gemfile @@ -23,7 +23,7 @@ gem 'jquery-rails' gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 1.0.1' +gem 'jbuilder', '~> 1.2' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/guides/code/getting_started/Gemfile.lock b/guides/code/getting_started/Gemfile.lock index 823fac5ff7..888a6b30e2 100644 --- a/guides/code/getting_started/Gemfile.lock +++ b/guides/code/getting_started/Gemfile.lock @@ -92,7 +92,7 @@ GEM multi_json (~> 1.0) hike (1.2.1) i18n (0.6.1) - jbuilder (1.0.2) + jbuilder (1.3.0) activesupport (>= 3.0.0) jquery-rails (2.2.0) railties (>= 3.0, < 5.0) -- cgit v1.2.3 From 42275a6badc251363a852f9d381b275be477e7aa Mon Sep 17 00:00:00 2001 From: Prathamesh Sonpatki Date: Sun, 5 May 2013 20:33:24 +0530 Subject: Updated link to to GitHub article about ignoring files [ci skip] - http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files --- guides/code/getting_started/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guides/code') diff --git a/guides/code/getting_started/.gitignore b/guides/code/getting_started/.gitignore index 25a742dff0..6a502e997f 100644 --- a/guides/code/getting_started/.gitignore +++ b/guides/code/getting_started/.gitignore @@ -1,4 +1,4 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See https://help.github.com/articles/ignoring-files for more about ignoring files. # # If you find yourself ignoring temporary files generated by your text editor # or operating system, you probably want to add a global ignore instead: -- cgit v1.2.3 From cd3177d315cd537a2810a27e0aff7e3a7af111f2 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Thu, 9 May 2013 08:36:37 +0200 Subject: "rails" -> "Rails" [ci skip] --- guides/code/getting_started/config/environment.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guides/code') diff --git a/guides/code/getting_started/config/environment.rb b/guides/code/getting_started/config/environment.rb index 2d65111004..e7e341c960 100644 --- a/guides/code/getting_started/config/environment.rb +++ b/guides/code/getting_started/config/environment.rb @@ -1,5 +1,5 @@ -# Load the rails application. +# Load the Rails application. require File.expand_path('../application', __FILE__) -# Initialize the rails application. +# Initialize the Rails application. Blog::Application.initialize! -- cgit v1.2.3 From 877920ba55d99eac1d68859f4f83d626645afa3e Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 15 May 2013 11:38:49 +0700 Subject: Removed incorrect warning from application.js templates and replaced it with stub command description --- guides/code/getting_started/app/assets/javascripts/application.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'guides/code') diff --git a/guides/code/getting_started/app/assets/javascripts/application.js b/guides/code/getting_started/app/assets/javascripts/application.js index 9e83eb5e7e..5a4fbaa370 100644 --- a/guides/code/getting_started/app/assets/javascripts/application.js +++ b/guides/code/getting_started/app/assets/javascripts/application.js @@ -7,8 +7,7 @@ // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // compiled file. // -// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD -// GO AFTER THE REQUIRES BELOW. +// stub path allows dependency to be excluded from the asset bundle. // //= require jquery //= require jquery_ujs -- cgit v1.2.3