diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a3e0b7f..c60000f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,6 @@ -3.2.0 - Ruby 2.2.3, Rails 4.2.5, activerecord-sqlserver-adapter 4.2.6, +3.2.0 - Ruby 2.2.4 + +3.1.1 - Ruby 2.1.8, Rails 4.2.5, activerecord-sqlserver-adapter 4.2.6, coffee-rails 4.1.1, jquery-rails 4.1.0, sass-rails 5.0.4, Git 2.7.0, 3.1.0 - Ruby 2.1.5 diff --git a/config/railsinstaller.yml b/config/railsinstaller.yml index 929e2f1..fbec088 100644 --- a/config/railsinstaller.yml +++ b/config/railsinstaller.yml @@ -7,7 +7,7 @@ - rake - :name: rails - :version: "4.2.5" + :version: "4.2.5.1" - :name: activerecord-sqlserver-adapter :version: "4.2.6" @@ -46,14 +46,14 @@ :title: Ruby 2.2.0 :name: Ruby220 :regex: '^.*$' - :url: "http://s3.amazonaws.com/railsinstaller/Resources/ruby-2.2.3-i386-mingw32.7z" + :url: "http://s3.amazonaws.com/railsinstaller/Resources/ruby-2.2.4-i386-mingw32.7z" :rename: Ruby2.2.0 :git: :category: component - :title: Git 2.7.0 + :title: Git 1.9.4 :name: Git - :url: "http://s3.amazonaws.com/railsinstaller/Resources/PortableGit-2.7.0-32-bit.7z" + :url: "http://s3.amazonaws.com/railsinstaller/Resources/PortableGit-1.9.4-preview20140929.7z" :target: "Git" :regex: '^.*$' diff --git a/lib/railsinstaller/methods.rb b/lib/railsinstaller/methods.rb index aa53bd0..fa91be6 100644 --- a/lib/railsinstaller/methods.rb +++ b/lib/railsinstaller/methods.rb @@ -218,7 +218,7 @@ def self.stage_postgresql # def self.link_devkit_with_ruby devkit_path = File.join(Stage, DevKit.target) - ruby_path = File.join(Stage, Ruby210.rename) + ruby_path = File.join(Stage, Ruby220.rename) FileUtils.mkdir_p(devkit_path) unless File.directory?(devkit_path) Dir.chdir(devkit_path) do File.open("config.yml", "w") do |file|