Santiago Pastorino
4519727cdb
Merge pull request #20383 from jonatack/fix-configurable-static-index-filename
...
Fix regression in #20017 wrong number of arguments error
2015-06-02 14:22:09 -03:00
Yves Senn
939d5a4932
Merge pull request #20387 from y-yagi/fix_engine_generated_controller_test
...
set engine's route in the functional test is generated in the engine
2015-06-02 16:20:40 +02:00
Sean Griffin
b6b13905e5
Skip test that fails from outdated sqlite3 on travis
2015-06-02 07:29:44 -06:00
Yves Senn
de412eed58
Merge pull request #20413 from kddeisz/pluck_postgres_fix
...
Fix postgresql DISTINCT requirement in pluck test
2015-06-02 11:44:52 +02:00
Kevin Deisz
2dd95a775c
Fix postgresql DISTINCT requirement in pluck test
2015-06-02 05:36:24 -04:00
Rafael Mendonça França
c87cce1ddf
Merge pull request #20410 from schneems/schneems/boo-global-vars
...
Use block variable instead of global
2015-06-01 23:17:42 -03:00
schneems
e1a7260640
Use block variable instead of global
...
```ruby
require 'benchmark/ips'
Benchmark.ips do |x|
x.report("$&") {
"foo".sub(/f/) { $&.upcase }
}
x.report("block var") {
"foo".sub(/f/) {|match| match.upcase }
}
end
```
```
Calculating -------------------------------------
$& 48.658k i/100ms
block var 49.666k i/100ms
-------------------------------------------------
$& 873.156k (± 9.3%) i/s - 4.331M
block var 969.744k (± 9.2%) i/s - 4.818M
```
It's faster, and gets rid of a few "magic" global variables
2015-06-01 19:44:40 -05:00
yuuji.yaginuma
3612793475
add test to run generated test files inside mountable engine
2015-06-02 09:11:48 +09:00
Abdelkader Boudih
f40ccb5464
Merge pull request #20409 from davydovanton/doc-queue-adapter
...
Add documentation for QueueAdapter::queue_adapter
2015-06-02 00:04:56 +01:00
Anton Davydov
455e44cd68
[skip ci] Add documentation for QueueAdapter::queue_adapter
2015-06-02 00:24:04 +03:00
Rafael Mendonça França
8b67f28f4a
Merge pull request #20357 from ronakjangir47/remove_mocha1
...
Removed use of mocha from railties actions_test
2015-06-01 13:44:01 -03:00
Santiago Pastorino
651fa5edcd
Merge pull request #20406 from yoongkang/add_edge_sprockets
...
Use sprockets-rails from github repo
2015-06-01 13:35:31 -03:00
Ronak Jangir
655b8be814
Removed use of mocha from railties actions_test
2015-06-01 21:56:12 +05:30
Yoong Kang Lim
757dd93c7f
Use sprockets-rails from github repo
...
See #20397
2015-06-02 02:02:01 +10:00
Rafael Mendonça França
a4cf371e11
Merge pull request #20405 from manish-shrivastava/master
...
Fixed typos in rails guide
2015-06-01 12:58:51 -03:00
manish-shrivastava
8145880541
Fixed typos in guide
2015-06-01 21:16:30 +05:30
Rafael Mendonça França
cf484e3ee3
Merge pull request #19094 from phoet/have_bearer_be_valid_as_well
...
Have Bearer be valid as well
2015-06-01 12:41:18 -03:00
Rafael Mendonça França
4e63bde623
Merge pull request #20362 from kddeisz/enumerable_pluck
...
Allow Enumerable#pluck to take a splat.
2015-06-01 12:40:19 -03:00
phoet
4d4440c5a8
add changelog entry
2015-06-01 17:39:06 +02:00
Rafael Mendonça França
bdfc662a11
Merge pull request #20138 from tgxworld/deprecated_assert_template
...
Deprecate `assert_template` and `assigns()`.
2015-06-01 12:39:03 -03:00
Rafael Mendonça França
bd83caa666
Merge pull request #20284 from kaspth/fix-caching-test
...
Move expectation to instance level.
2015-06-01 12:38:08 -03:00
Rafael Mendonça França
03ddab096f
Merge pull request #20398 from nkondratyev/fix-time-change
...
Fix a range of values for parameters of the Time#change
2015-06-01 12:23:33 -03:00
Rafael Mendonça França
b8e8b67290
Merge pull request #20386 from yoongkang/circular_import
...
Fix circular import warning on build
2015-06-01 12:23:09 -03:00
Rafael Mendonça França
1bfa81bd6e
Merge pull request #20401 from yahonda/master_bigint_as_limit_19_in_oracle
...
Map :bigint as NUMBER(19) sql_type by using `:limit => 19` for Oracle
2015-06-01 11:57:54 -03:00
Rafael Mendonça França
57e19e91ce
Merge pull request #20403 from takiy33/patch-1
...
Use --no-document option instead of --no-rdoc and --no-ri option
2015-06-01 11:40:27 -03:00
takiy33
c7eba12f92
Use --no-document option instead of --no-rdoc and --no-ri option
2015-06-01 22:26:22 +09:00
Yasuo Honda
a9e6e6e07a
Map :bigint as NUMBER(19) sql_type by using :limit => 19
for Oracle
...
since NUMBER(8) is not enough to store the maximum number of bigint.
Oracle NUMBER(p,0) as handled as integer
because there is no dedicated integer sql data type exist in Oracle database.
Also NUMBER(p,s) precision can take up to 38. p means the number of digits, not the byte length.
bigint type needs 19 digits as follows.
$ irb
2.2.2 :001 > limit = 8
=> 8
2.2.2 :002 > maxvalue_of_bigint = 1 << ( limit * 8 - 1)
=> 9223372036854775808
2.2.2 :003 > puts maxvalue_of_bigint.to_s.length
19
=> nil
2.2.2 :004 >
2015-06-01 12:23:20 +00:00
Yves Senn
2db8414102
Merge pull request #20371 from davydovanton/doc-adapter-lookup
...
Update documentation for QueueAdapters::lookup [ci skip]
2015-06-01 13:32:35 +02:00
Anton Davydov
528efcbbbe
[skip ci] Update documentation for QueueAdapters::lookup
2015-06-01 14:21:28 +03:00
Matthew Draper
6457fbfe3e
Merge pull request #20394 from mechanicles/use-sym
...
[ci skip] Used 'instance_variables' in example for consistency.
2015-06-01 20:46:36 +09:30
phoet
4b4e890781
allow Bearer
as well as Token
2015-06-01 11:41:26 +02:00
phoet
90918b5f22
actually test what the name says
2015-06-01 11:41:26 +02:00
Santosh Wadghule
11fecafcf2
[ci skip] Used 'instance_variables' in example for consistency.
...
- Found that checking instance_variables elements using string object
gives us 'false' value.
`instance_variables.include? "@articles" # => false`
- Used only 'instance_variables' instead of using '.include?' on it. So
that it will return recent instance variables list.
2015-06-01 14:04:19 +05:30
Nikolay Kondratyev
d98928019a
Fix a range of values for parameters of the Time#change
...
Passing 999999000 < `:nsec` < 999999999 and 999999 < `:usec` < 1000000
to change a time with utc_offset doesn't throw an `ArgumentError`.
2015-06-01 13:25:09 +05:00
Kasper Timm Hansen
c4cb751da6
Merge pull request #20396 from nkondratyev/fix-guides
...
Remove description of `dependency_loading` option
2015-06-01 09:21:41 +02:00
Nikolay Kondratyev
19ede1f85d
Remove description of dependency_loading
option
...
This option has been removed in e6747d87f3a061d153215715d56acbb0be20191f
[ci skip]
2015-06-01 11:57:49 +05:00
Arun Agrawal
efd3d20dd1
Merge pull request #20393 from yui-knk/fix/guide2
...
[ci skip] Fix `above` -> `below`
2015-06-01 07:15:58 +02:00
yui-knk
20ee4d0862
[ci skip] Fix above
-> below
2015-06-01 13:52:51 +09:00
Zachary Scott
beadad4f30
Merge pull request #20392 from equiamos/equiamos-fix-typos-docs
...
Fixed typos [ci skip]
2015-05-31 18:39:38 -07:00
Morgan Owens
78ad5fa0a4
Fixed typos. [ci skip]
2015-05-31 21:07:11 -04:00
eileencodes
f6b01c1d06
Use any?
rather than present?
to check args
...
It's better to use Ruby methods when possible over methods defined by
Active Support because then it does not need to rely on any
dependencies.
2015-05-31 18:51:33 -04:00
yuuji.yaginuma
c861ef283f
add engine's namespace to fixture name
2015-05-31 21:28:51 +09:00
Yves Senn
1a4f470d59
no rails command short-cuts in the getting-started guide. [ci skip]
...
The full command name is more expressive.
2015-05-31 13:14:40 +02:00
Yves Senn
b25436abc4
minor formatting changes in changelogs. [ci skip]
2015-05-31 11:24:36 +02:00
yuuji.yaginuma
6a8d91897b
set engine's route in the functional test is generated in the engine
2015-05-31 12:54:38 +09:00
Yoong Kang Lim
179b9f6a25
Fix circular import warning on build
2015-05-31 13:15:08 +10:00
Sean Griffin
0b34b79d64
Attempt to fix travis failures
...
The version of SQLite used by Travis is outdated. We need to install a
newer version.
2015-05-30 18:00:19 -06:00
Jon Atack
b7b75e0794
Fix regression in #20017 : wrong number of arguments error
...
and use coherent quoting/spacing.
This should hopefully fix a regression that was introduced with #20017 ,
causing deployment pushes to Heroku to be rejected with the following
trace:
ArgumentError: wrong number of arguments (2 for 3)
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tatic.rb:16:in `initialize'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem
s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in
`new'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem
s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in
`initialize'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:43:in `new'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:43:in `build'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:118:in `block in build'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:118:in `each'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:118:in `inject'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:118:in `build'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/engine.rb:509:in `app'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application/finisher.rb:
34:in `block in <module:Finisher>'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in
`instance_exec'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in
`run'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:55:in
`block in run_initializers'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:54:in
`run_initializers'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application.rb:352:in
`initialize!'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/config/environment.rb:5:in
`<top (required)>'
2015-05-30 22:26:13 +02:00
Sean Griffin
0ef7e73f0a
Ensure symbols passed to select
are always quoted
...
Our general contract in Active Record is that strings are assumed to be
SQL literals, and symbols are assumed to reference a column. If a from
clause is given, we shouldn't include the table name, but we should
still quote the value as if it were a column.
Upon fixing this, the tests were still failing on SQLite. This was
because the column name being returned by the query was `"\"join\""`
instead of `"join"`. This is actually a bug in SQLite that was fixed a
long time ago, but I was using the version of SQLite included by OS X
which has this bug. Since I'm guessing this will be a common case for
contributors, I also added an explicit check with a more helpful error
message.
Fixes #20360
2015-05-30 12:35:51 -06:00
Sean Griffin
6bd2573869
Add docs and changelog entry for 73aab03 [ci skip]
2015-05-30 11:13:28 -06:00