Sean Griffin
a0e34619b8
Merge pull request #18170 from tgxworld/add_docs_for_rails_application_secrets
...
[ci skip]
2014-12-23 09:44:12 -07:00
Guo Xiang Tan
2f7b72b793
Rails::Application#secrets should be documented.
2014-12-24 00:32:31 +08:00
Sean Griffin
a03ea684ef
Use the new foreign_key
option on references
in generators
...
Changes `rails g model Post user:references` from
def change
create_table :posts do |t|
t.references :user, index: true
end
add_foreign_key :posts, :users
end
to
def change
create_table :posts do |t|
t.references :user, index: true, foreign_key: true
end
end
Changes `rails g migration add_user_to_posts user:references` from
def change
add_reference :posts, :users, index: true
add_foreign_key :posts, :users
end
to
def change
add_reference :posts, :users, index: true, foreign_key: true
end
2014-12-22 13:47:11 -07:00
Sean Griffin
9fff631a06
Skip byebug on all non-MRI rubies, fix tests
...
The changes in #18149 added tests for the app generator, but only fixed
it for the plugin generator (I should have let CI finish though I think
it would have failed as an allowed failure).
2014-12-22 13:43:58 -07:00
Arthur Neves
0bb73f03e4
Only add debugger/byebug if on MRI
2014-12-22 15:27:56 -05:00
rochefort
2114e6bf29
Fix typo in nodoc
2014-12-22 17:14:58 +09:00
Xavier Noria
83bbc2352c
prefer single quotes, by the beard of the prophet!
2014-12-20 00:51:30 +01:00
Tim Pope
1ae88b84a6
Make bin/setup portable
2014-12-19 18:36:53 -05:00
Godfrey Chan
2d04bdd86f
Merge pull request #18100 from chancancode/serve_static_files
...
Allow static asset serving from env variable (enhanced!)
Conflicts:
railties/CHANGELOG.md
2014-12-19 14:55:34 -08:00
Rafael Mendonça França
efbbb30534
Merge pull request #18049 from yuki3738/fix_rails_db_command_error
...
Add a code checking about file or not to the rails db command
2014-12-16 15:12:21 -02:00
George Millo
d75773ada0
English fix [ci skip]
2014-12-16 14:32:06 +00:00
yuki3738
17bb531f82
Add a code checking about file or not to the rails db command
2014-12-16 19:28:00 +09:00
NorimasaAndo
8493f44976
Fix Duplicate web-console entries in Gemfile
2014-12-14 21:25:26 +09:00
Rafael Mendonça França
83534e5678
New applications should use sass-rails 5.0
2014-12-12 20:48:44 -02:00
Rafael Mendonça França
193ec360b1
Rails master requires arel master
2014-12-12 18:49:45 -02:00
Godfrey Chan
46617f02c6
Align the GemfileEntry API with stable branches
...
See 63462ec
2014-12-12 11:23:17 -08:00
yui-knk
083505a7d6
[ci skip] Fix typo
2014-12-09 13:02:03 +09:00
Sam Ruby
8275b65987
Use latest web-console when using --dev or --edge
...
Fixes:
http://intertwingly.net/projects/AWDwR4/checkdepot-215/makedepot.log
2014-12-05 11:18:18 -05:00
Rafael Mendonça França
da13b9aedc
Merge pull request #17797 from y-yagi/donot_delete_mailer_layouts
...
Don't remove mailer layouts files
2014-12-04 18:29:50 -02:00
Akira Matsuda
ae54cb29d4
require 'rake' before requiring Rake tasks
...
Without this,
% rails r "require 'rails/tasks'"
would cause a NoMethodError: undefined method `desc' for main:Object
2014-12-03 06:28:09 +09:00
Guo Xiang Tan
106db0b419
Silence Minitest for plugin tests.
...
Fixes https://github.com/rails/rails/issues/17340 .
Use Minitest::BacktraceFilter instead of removing all silencers. This
will allow the backtrace for all libraries in the plugin to be shown
while removing noise generated by Minitest's backtrace.
2014-12-02 18:47:03 +08:00
Sam
6edc26f47e
FIX: absolute_path may be nil for code added via instance_eval
2014-12-01 12:35:16 +11:00
Erik Michaels-Ober
d1374f99bf
Pass symbol as an argument instead of a block
2014-11-29 11:53:24 +01:00
Xavier Noria
56e47cf66d
adds missing period in test.rb [ci skip]
2014-11-29 08:48:23 +01:00
claudiob
96d0f751f9
Bump required Ruby version to 2.1.0
...
[This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0 ) states that:
> Rails 5.0 is in most likelihood going to target Ruby 2.2.
Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383 )
that **at least** version 2.1.0 **must** be required by the `gemspec` files.
2014-11-28 22:59:51 -08:00
Rafael Mendonça França
c6bd5284b3
We don't need to use sass-rails 5.0.0.beta
2014-11-28 15:15:30 -02:00
Rafael Mendonça França
f25ad07f5a
Start Rails 5 development 🎉
...
We will support only Ruby >= 2.1.
But right now we don't accept pull requests with syntax changes to drop
support to Ruby 1.9.
2014-11-28 15:00:06 -02:00
Yves Senn
6c83d4bfd5
docs, AR no longer makes use of test:prepare
. [ci skip]
...
Change originated from https://github.com/rails/rails/pull/17739#issuecomment-64829088
/cc @metaskills
2014-11-28 11:05:13 +01:00
Santiago Pastorino
31815d7167
Revert "Test against rack master"
...
This reverts commit 2a4e14db981e38611667d407a975600ee720ada7.
2014-11-27 16:53:58 -02:00
Xavier Noria
4eefa1a0ac
rails -> bin/rails in index.html
2014-11-27 00:45:16 -08:00
yuuji.yaginuma
f9411b464d
Don't remove mailer layouts files
2014-11-27 14:36:10 +09:00
Rafael Mendonça França
2a4e14db98
Test against rack master
2014-11-26 16:17:51 -02:00
Yves Senn
683b476b45
Merge pull request #17761 from pschrammel/master
...
be more general with adapter name
2014-11-26 15:20:25 +01:00
Rafael Mendonça França
1a35f907a9
Merge pull request #17782 from cheba/engine-root-master
...
Use absolute_path of caller_locations to infer engine root
2014-11-26 11:49:21 -02:00
Juan Ignacio Pumarino
3766015f07
Provide support for SQL Server connections with dbconsole using sqsh
2014-11-26 10:36:54 -03:00
Alexander Mankuta
f2b17231ba
Use absolute_path of caller_locations to infer engine root
...
According to documentation `path` only returns file names. On MRI it's
not the case but it's likely a bug in MRI.
2014-11-26 13:47:09 +02:00
Rafael Mendonça França
75eacb00e0
Use jquery-rails 4.0.0
2014-11-25 22:34:10 -02:00
Sean Griffin
807d61dc8b
Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1
...
Use web_console 2.0 for 4.2.0.rc1 release
2014-11-25 17:26:45 -07:00
Genadi Samokovarov
7f864ccd65
Use web_console 2.0 for 4.2.0.rc1 release
...
This one replaces the notable web-console mentions in guide and the
default Gemfile.
2014-11-26 02:10:05 +02:00
Rafael Mendonça França
ac0432cf35
Fix syntax error 💣
2014-11-25 20:16:09 -02:00
Rafael Mendonça França
e3f7817cec
Use released rails-dom-testing
2014-11-25 19:43:36 -02:00
Peter Schrammel
1c61b74ce2
be more general with adapter name
2014-11-25 08:56:01 +01:00
Guo Xiang Tan
7a47690a13
Generate mailer layouts even if no action is given.
2014-11-25 09:21:37 +08:00
Guo Xiang Tan
35628a44b2
MailerGenerator should inherit from Base.
2014-11-25 09:16:11 +08:00
Guo Xiang Tan
b8d8ce7ba8
Add tests which were incorrectly removed.
2014-11-25 09:14:59 +08:00
David Heinemeier Hansson
35362fc226
Merge pull request #17646 from andyjeffries/html_layout_fix
...
Creating mailer layouts by default, including html and body tags
2014-11-25 01:59:43 +03:00
Arthur Neves
8e1e9f6c70
Fix sprockets-rails dependency dance
...
- Remove sprockets-rails from generated Gemfile as rails has a hard-dependency on it
- Also allow sprockets-rails >= 2.0.0
2014-11-24 16:30:26 -05:00
Santiago Pastorino
48a8830587
Merge pull request #17737 from yui-knk/fix/head
...
Replace ActionDispatch::Head with Rack::Head.
2014-11-24 14:58:01 -02:00
Richard Littauer
746c3741e7
Fix wrong path in comments about stylesheets
...
I put the wrong path in my last PR by accident. Fixed here. Related to #17742
2014-11-24 10:26:01 -05:00
Richard Littauer
7b378403d3
Change 'of plugins' syntax
...
Currently, the docs uses a syntax that is unclear and not general
American English. I've switched it to be clearer wording. Not a big
fix, but may be helpful.
2014-11-24 10:22:44 -05:00