aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21854 from morgoth/fix-serializing-at-option-in-aj-matchersYves Senn2015-10-053-8/+38
|\ | | | | | | Fixed serializing `:at` option for `assert_eqnueued_with` and `assert_performed_with`
| * Fixed serializing `:at` option for `assert_enqueued_with` and ↵Wojciech Wnętrzak2015-10-033-8/+32
| | | | | | | | `assert_performed_with`
* | Merge pull request #21033 from dgynn/preloader_build_scope_tuningArthur Nogueira Neves2015-10-041-1/+3
|\ \ | | | | | | Skip _select! call unless needed for preloader
| * | skip _select! call unless :select values are specifiedDave Gynn2015-07-261-1/+3
| | | | | | | | | | | | | | | the default scope will select all fields. removing this improves performance and reduces String creation.
* | | Merge pull request #20981 from dkoprov/ar_postgres_enum_docs_additionSean Griffin2015-10-041-5/+41
|\ \ \ | | | | | | | | Add more info on working with postgres ENUM type
| * | | adds more info on working with postgres ENUM typeDmitry Koprov2015-07-231-5/+41
| | | |
* | | | Merge pull request #20986 from radar/rails-engine-caller-locationsArthur Nogueira Neves2015-10-041-6/+1
|\ \ \ \ | | | | | | | | | | Remove check for caller_locations in Rails::Engine
| * | | | Remove check for caller_locations in Rails::EngineRyan Bigg2015-07-231-6/+1
| |/ / / | | | | | | | | | | | | This is no longer necessary, as the minimum version requirement for Ruby is 2.2.2, and the `caller_locations` feature was added in Ruby 2.0.0. Since Rails no longer supports pre 2.0 versions of Ruby, there is no need to check first if the Kernel does respond to `caller_locations`. The answer is: yes it does.
* | | | Merge pull request #21005 from jaredbeck/patch-1Arthur Nogueira Neves2015-10-041-1/+3
|\ \ \ \ | | | | | | | | | | Docs: Update options for add_reference
| * | | | Docs: Update options for add_referenceJared Beck2015-07-231-1/+3
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #20116 from cristianbica/activejob-enqueue-loggingArthur Nogueira Neves2015-10-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | ActiveJob - log enqueued message only after the job was successfully enqueued
| * | | | | ActiveJob - log enqueued message only after the job was successfully enqueuedCristian Bica2015-05-111-1/+1
| | | | | |
* | | | | | Merge pull request #21865 from Gaurav2728/test_cases_protected_method_nodocSean Griffin2015-10-041-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | action mailer test cases protected method can be `# :nodoc:` [ci skip]
| * | | | | | action mailer test cases protected method can be `# :nodoc:`Gaurav Sharma2015-10-041-5/+5
| | | | | | |
* | | | | | | Merge pull request #21867 from akihiro17/fix-relation-docSean Griffin2015-10-041-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Fix ActiveRecord::Relation#update documentation
| * | | | | | | [ci skip] Fix ActiveRecord::Relation#update documentationakihiro172015-10-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * before ``` people = Person.where(group: 'expert') people.update(group: 'masters') Note: Updating a large number of records will run a UPDATE query for each record, which may cause a performance issue. So if it is not needed to run callbacks for each update, it is preferred to use <tt>update_all</tt> for updating all records using a single query. ``` * after ``` people = Person.where(group: 'expert') people.update(group: 'masters') ``` Note: Updating a large number of records will run an UPDATE query for each record, which may cause a performance issue. So if it is not needed to run callbacks for each update, it is preferred to use <tt>update_all</tt> for updating all records using a single query.
* | | | | | | | Merge pull request #21868 from tanmay3011/fix_time_class_documentationVijay Dev2015-10-051-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Fix #seconds_since_midnight documentation output it will al…
| * | | | | | | | [ci skip] Fix #seconds_since_midnight documentation output it will always ↵Tanmay Sinha2015-10-051-3/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | return floating pointnumber
* | | | | | | | Merge pull request #21857 from cllns/fix-myspace-example-wordingClaudio B.2015-10-041-5/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Update text on CSS Injection
| * | | | | | | Update text on CSS Injection / MyspaceSean Collins2015-10-031-5/+3
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | Merge pull request #21866 from tanmay3011/fix_documentationSean Griffin2015-10-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix Time.now format in documentation [ci skip]
| * | | | | | | Fix Time.now format in documentationTanmay Sinha2015-10-041-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #21863 from tanmay3011/use_applications_yearSean Griffin2015-10-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use #current instead of #now to prevent zone issues and use new ruby …
| * | | | | | | Use Time#current instead of Time#now to prevent zone issue inorder to use ↵Tanmay Sinha2015-10-041-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | application's time zone
* | | | | | | Merge pull request #21848 from yui-knk/test_suppress_warningsSean Griffin2015-10-041-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Suppress warnings of `assigned but unused variable`
| * | | | | | | Suppress warnings of `assigned but unused variable`yui-knk2015-10-031-3/+2
| | | | | | | |
* | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-0420-27/+31
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [ci skip] Fix commentyui-knk2015-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `alias :migrations_path= :migrations_paths=`, so `migrations_path = some_string` is correct.
| * | | | | | | [ci skip] default_normalization_form accessing from UnicodeGaurav Sharma2015-09-291-1/+1
| | | | | | | |
| * | | | | | | Revert "proper raise ArgumentError, divided large text new line"Rafael Mendonça França2015-09-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4147ab730e807f622e5260a5f876749ff41fef26.
| * | | | | | | adding basic change_column and remove_columns in CommandRecorder ↵Gaurav Sharma2015-09-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentations [ci skip]
| * | | | | | | proper raise ArgumentError, divided large text new lineGaurav Sharma2015-09-292-4/+4
| | | | | | | |
| * | | | | | | Add missing punctuation mark to all ActionMailer docs [ci skip]amitkumarsuroliya2015-09-285-12/+12
| | | | | | | |
| * | | | | | | Renamed ‘Return’ to ‘Returns’ [ci skip]Ronak Jangir2015-09-287-9/+9
| | | | | | | |
| * | | | | | | Add a missing period to ActionMailer Base docs [ci skip]amitkumarsuroliya2015-09-281-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Fix document of `ActionController::RequestForgeryProtection`yui-knk2015-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add `end` to end of class definition * add a blank line between explanation and example code
| * | | | | | | [ci skip] Add `:` before code blocks.yui-knk2015-09-251-1/+1
| | | | | | | |
| * | | | | | | Add a missing period to layouts_and_rendering.md [ci skip]Juanito Fatas2015-09-241-1/+1
| | | | | | | |
| * | | | | | | Documentation typoAkira Matsuda2015-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #21861 from jeremy/rack-add-headerJeremy Daer2015-10-036-34/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Introduce `Headers#add`. Move `Response#add_header` upstream.
| * | | | | | | | Introduce `Headers#add`. Move `Response#add_header` upstream.Jeremy Daer2015-10-036-34/+37
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce `ActionDispatch::Http::Headers#add` to add a value to a multivalued header. * Move `Response#add_header` upstream: https://github.com/rack/rack/pull/957 * Match upstream `Response#have_header?` -> `#has_header?` name change.
* | | | | | | | Missed Gemfile change in f849cfe36c585fbc58c4a5fd91b0ae1571d38bcbJeremy Daer2015-10-031-4/+0
| | | | | | | |
* | | | | | | | YAGNI concurrent-ruby master branch now that 1.0.0.pre3 is released with ↵Jeremy Daer2015-10-031-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes for warnings and circular require
* | | | | | | | Revert "removing Rack::Runtime from the default stack."Aaron Patterson2015-10-037-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 37423e4ff883ad5584bab983aceb4b2b759a1fd8. Jeremy is right that we shouldn't remove this. The fact is that many engines are depending on this middleware to be in the default stack. This ties our hands and forces us to keep the middleware in the stack so that engines will work. To be extremely clear, I think this is another smell of "the rack stack" that we have in place. When manipulating middleware, we should have meaningful names for places in the req / res lifecycle **not** have engines depend on a particular constant be in a particular place in the stack. This is a weakness of the API that we have to figure out a way to address before removing the constant. As far as timing attacks are concerned, we can reduce the granularity such that it isn't useful information for hackers, but is still useful for developers.
* | | | | | | | Merge pull request #21860 from vngrs/wrong_usage_of_a_in_docEileen M. Uchitelle2015-10-035-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Wrong usage of 'a' in docs fixed [ci skip]
| * | | | | | | | Wrong usage of 'a' in docs fixed [ci skip]Mehmet Emin İNAÇ2015-10-035-5/+5
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #21855 from acapilleri/save_perfSean Griffin2015-10-032-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Singleton in NullMutationTracker class
| * | | | | | | | Add Singleton in NullMutationTracker classacapilleri2015-10-032-1/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | to reduce allocation of same object
* | | | | | | | Merge pull request #21853 from amitsuroliya/deprecated_string_middlewareKasper Timm Hansen2015-10-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fixed deprecated string to specify the middleware [ci skip]
| * | | | | | | Fixed deprecated string to specify the middleware [ci skip]amitkumarsuroliya2015-10-031-1/+1
|/ / / / / / /