Commit Graph

8354 Commits

Author SHA1 Message Date
Piotr Sarnacki
0f5cc34ab5 Revert changes related to bundle install fixes in rails new
Reverted changes:
  f3482a9 Fix tests in railties
  5904295 improve #6318
  aed906a prevent using already loaded Gemfile for 'bundle install'

In order to fix this, we need a fix in bundler related to GEM_PATH,
which will allow to run tests properly. I will get this changes back
when it happens.
2012-05-17 11:33:40 -07:00
Piotr Sarnacki
8bc1e532a9 Load all the env files available in config.paths (closes #6335) 2012-05-16 15:47:00 -07:00
Aaron Patterson
78b6fdd89f Merge pull request #6337 from bcardarella/patch-1
Changing the indentation level of the block comment close for Sass
2012-05-16 14:39:46 -07:00
Piotr Sarnacki
f3482a9fb1 Fix tests in railties
Since `bundle install` was fixed in `rails plugin new`, it
now requires `rails 4.0.0.beta` version in filesystem when
running tests. Instead of providing it, we can run tested
command with `--dev` option, to use rails from the local
directory.
2012-05-15 22:48:05 -07:00
Michal Papis
5904295b23 improve #6318 2012-05-15 22:31:08 -07:00
Brian Cardarella
ef703b537b Changing the indentation level of the block comment close for SASS
If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
2012-05-15 22:57:14 -03:00
Vijay Dev
59b03d418f Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	actionpack/lib/action_view/helpers/asset_tag_helper.rb
2012-05-15 13:13:55 +05:30
Michal Papis
aed906af97 prevent using already loaded Gemfile for 'bundle install', fix #6314 2012-05-15 08:57:05 +02:00
Francesco Rodriguez
17059a4868 Removing ==Examples and last blank lines of docs from railties 2012-05-14 10:50:59 -05:00
Carlos Antonio da Silva
017632fe2b Remove not used date variable and another test warning 2012-05-14 12:31:51 -03:00
José Valim
f4c8f8c5aa Remove assertion on date from humans.txt tests 2012-05-14 18:09:53 +03:00
José Valim
e7a83df222 Remove dates and environment variables from humans.txt 2012-05-14 17:37:06 +03:00
José Valim
c13a3f0fc1 Since escape_html_entities_in_json was moved to 3-2-stable, make it true in AS, closes #6287 2012-05-14 08:02:45 +02:00
Carlos Antonio da Silva
116ab8f358 Merge pull request #6307 from oscardelben/refactor_app_generator_test
Refactor App Generator Test
2012-05-13 13:32:47 -07:00
Oscar Del Ben
27dd500254 Refactor App Generator Test 2012-05-13 09:44:43 -07:00
Santiago Pastorino
6e55d30ca8 Remove remaining require 'rubygems' 2012-05-13 13:33:20 -03:00
Kornelius Kalnbach
d8c1949684 require "rubygems" is obsolete in Ruby 1.9.3 2012-05-13 14:47:25 +02:00
Rafael Mendonça França
99e2a223e8 Remove tailing spaces ✂️ [ci skip] 2012-05-12 15:51:40 -03:00
Santiago Pastorino
45f6dcd903 Move AS set configs to AS Raitie 2012-05-12 12:54:28 -03:00
Santiago Pastorino
bae190c5a6 Merge pull request #6271 from homakov/patch-5
configuration for active_support and JSON Encoding
2012-05-12 08:48:58 -07:00
Vijay Dev
f2f6534272 s/wether/whether [ci skip] 2012-05-12 19:08:19 +05:30
José Valim
98355fe100 Merge pull request #6277 from homakov/patch-6
Comment for active_support's option in application.rb
2012-05-12 05:45:59 -07:00
Geoffrey Roguelon
38b4e7c8b1 Add commas missing in performance tests 2012-05-12 10:36:35 +02:00
Egor Homakov
1d1939056a Update railties/lib/rails/generators/rails/app/templates/config/application.rb 2012-05-12 10:26:22 +04:00
Santiago Pastorino
36dd1857dc Remove useless load path modifications 2012-05-11 19:00:35 -03:00
Egor Homakov
5613fb0b87 Update railties/lib/rails/application/bootstrap.rb 2012-05-11 18:11:58 +04:00
Enrico Carlesso
1abf15657b In robots.txt, User-agent should be all downcase except for the first 'U', according with http://en.wikipedia.org/wiki/Robots_exclusion_standard 2012-05-11 11:50:15 +02:00
David Padilla
0d48b12fc5 Fixes issue #6251
Plugin generator crashes when using the --dummy-path option

Code was assuming the application name in `config/application.rb`
was module Dummy.
2012-05-10 17:37:12 -07:00
Piotr Sarnacki
b14d1cd8ae Failing test for #6251 2012-05-10 17:37:12 -07:00
Xavier Noria
ef9dd27223 registers ceb1dcc in the CHANGELOG 2012-05-09 00:47:45 +02:00
Arun Agrawal
757a0ce6aa Adding test for humans.txt 2012-05-08 18:02:25 +05:30
Paul Campbell
ceb1dcc3db add humans.txt 2012-05-08 11:44:58 +01:00
Piotr Sarnacki
d98bbdee14 Fix build 2012-05-06 21:38:34 -07:00
Piotr Sarnacki
055857841a Ensure that Rails.env is equal to "test" by default when running tests.
Rails.env when running tests on localhost differs from travis ci
which makes it harder to write tests that check env related things.
2012-05-06 21:36:59 -07:00
Jeremy Kemper
b41bfb04b9 Merge pull request #5910 from route/rails-dbconsole
Fast path starts the database console without loading the full Rails env
2012-05-06 16:23:38 -07:00
Piotr Sarnacki
9d03e20b19 Remove obsolete deep_dup requires 2012-05-06 12:33:02 -07:00
Dmitry Vorotilin
346bb01849 More faster rails dbconsole 2012-05-06 22:53:53 +04:00
Alexey Gaziev
657b4ff04a Nice logic for deep_dup in rails 2012-05-06 10:28:35 -07:00
Piotr Sarnacki
2ce5e4fa6c Give more detailed instructions in script/rails in engine
closes #4894
2012-05-04 23:11:11 -07:00
Carlos Antonio da Silva
7a6116b633 Add some docs and changelog entry 2012-05-04 09:11:45 -03:00
Carlos Antonio da Silva
8fbf2e197f Allow overriding exception handling in threaded consumer 2012-05-04 09:11:44 -03:00
Carlos Antonio da Silva
1385388452 Allow configuring a different queue consumer
Also make sure to not use default queue consumer with custom queue
implementation. It is up to the new queue implementation to
start / shutdown the consumer.
2012-05-04 09:11:44 -03:00
Piotr Sarnacki
4f77f956a8 Merge pull request #5821 from Deradon/fix-engine-tasks
Provided fix for calling rake tasks within mountable engines
2012-05-03 22:47:29 -07:00
Piotr Sarnacki
b55b77f1ef Merge pull request #6012 from avakhov/dbconsole-test
Cover Rails::DBConsole with tests
2012-05-03 10:48:26 -07:00
Jeremy Kemper
6a4541d63e Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presence
Gem const presence checking has been removed
2012-05-02 06:21:12 -07:00
Jeremy Kemper
2ad91eecee Merge pull request #6116 from romanvbabenko/refactor/executable_rakefiles
Rakefile executable attributes and shebang lines has been removed
2012-05-02 06:17:56 -07:00
Arun Agrawal
1cfa34f83e Fix build for railties generators 2012-05-02 17:31:29 +05:30
Arun Agrawal
1206e88a75 build fix for SharedGeneratorTests 2012-05-02 16:27:22 +05:30
Roman V. Babenko
e17cc4d493 Gem cont presence checking has been removed 2012-05-02 13:56:13 +03:00
Roman V. Babenko
84feca4aaa Rakefile executable attributes and shebang lines has been removed 2012-05-02 13:38:13 +03:00