aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Bump Arel to fix few failing tests on Ruby 2.4 related to the Integer unifica...Prathamesh Sonpatki2016-07-241-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #25950 from jules2689/masterRafael França2016-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Also yield in parameters for a nil content_mime_typeJulian Nadeau2016-07-251-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Whoops, forgot the changelog entry for the previous commitSean Griffin2016-07-251-0/+5
* | | | | | | | | | | Correct the behavior of virtual attributes on models loaded from the dbSean Griffin2016-07-256-12/+74
|/ / / / / / / / / /
* | | | | | | | | | systematic revision of =~ usage in AVXavier Noria2016-07-2511-28/+39
* | | | | | | | | | use \A and \z when you mean \A and \zXavier Noria2016-07-241-1/+1
* | | | | | | | | | adds missing requiresXavier Noria2016-07-2411-1/+14
* | | | | | | | | | systematic revision of =~ usage in AMoXavier Noria2016-07-244-7/+11
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #25928 from mechanicles/info-for-cache-fetch-blockप्रथमेश Sonpatki2016-07-241-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Proper description for `Rails.cache.fetch` [ci skip]Santosh Wadghule2016-07-241-1/+1
* | | | | | | | | | removes spurious lineXavier Noria2016-07-241-1/+0
* | | | | | | | | | give some love to this test fileXavier Noria2016-07-231-151/+155
* | | | | | | | | | systematic revision of =~ usage in ARXavier Noria2016-07-2321-29/+34
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #25908 from mechanicles/derives-fromKasper Timm Hansen2016-07-232-8/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Explain meaning of the code very well and Remove confusion. [ci skip]Santosh Wadghule2016-07-232-8/+8
| |/ / / / / / / /
* | | | | | | | | Merge pull request #25914 from jmccartie/jm/not_inRafael França2016-07-224-0/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds `not_in?` onto ObjectJon McCartie2016-07-214-0/+81
* | | | | | | | | | revises a regexpXavier Noria2016-07-221-1/+1
* | | | | | | | | | systematic revision of =~ usage in ASXavier Noria2016-07-2217-29/+43
* | | | | | | | | | adds require for Regexp#match?Xavier Noria2016-07-221-0/+2
* | | | | | | | | | revises styleXavier Noria2016-07-221-1/+1
* | | | | | | | | | the infamous typo only seen in GitHub's diff [ci skip]Xavier Noria2016-07-221-1/+1
|/ / / / / / / / /
* | | | | | | | | performance boost for String#blank? in Ruby 2.4Xavier Noria2016-07-221-1/+1
* | | | | | | | | define Range#match? if Ruby < 2.4Xavier Noria2016-07-224-2/+54
* | | | | | | | | Allow MessageEncryptor to take advantage of authenticated encryption modesBart de Water2016-07-213-4/+64
* | | | | | | | | Merge pull request #25911 from juno/fix-comment-indentXavier Noria2016-07-211-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix incorrect indentation in method comment [ci skip]Junya Ogura2016-07-211-3/+3
|/ / / / / / / / /
* | | | | | | | | explain the meaning of some RuboCop config options [ci skip]Xavier Noria2016-07-211-0/+8
* | | | | | | | | Merge pull request #25907 from gsamokovarov/lock-web-console-for-5.0Yves Senn2016-07-212-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Enforce minimal web-console version for Rails 5Genadi Samokovarov2016-07-212-3/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #25616 from ignatiusreza/callable_cache_keyKasper Timm Hansen2016-07-213-5/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Bring back support for callable cache_key on collection renderingIgnatius Reza2016-07-213-5/+30
|/ / / / / / / /
* | | | | | | | Merge pull request #25902 from etiennebarrie/remove-tabs-before-commandsRafael França2016-07-201-4/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove tab chars before commands to be runÉtienne Barrié2016-07-201-4/+4
|/ / / / / / /
* | | | | | | Merge pull request #25885 from kamipo/fix_explain_logging_with_bindsRafael França2016-07-204-17/+28
|\ \ \ \ \ \ \
| * | | | | | | Fix explain logging with bindsRyuta Kamizono2016-07-204-17/+28
| |/ / / / / /
* | | | | | | Merge pull request #25786 from kamipo/add_exists_and_update_all_to_collection...Rafael França2016-07-202-5/+21
|\ \ \ \ \ \ \
| * | | | | | | Add `exists?` and `update_all` to `CollectionProxy` for respects an associati...Ryuta Kamizono2016-07-202-5/+21
| |/ / / / / /
* | | | | | | Merge pull request #25897 from yahonda/remove_set_date_columns_and_modify_att...Rafael França2016-07-202-14/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Oracle TIMESTAMP sql type is associated with Rails `DateTime` type nowYasuo Honda2016-07-202-14/+1
* | | | | | | Merge pull request #25438 from prathamesh-sonpatki/rm-session-store-initializerRafael Mendonça França2016-07-2010-29/+49
|\ \ \ \ \ \ \
| * | | | | | | Setup default session store internally, no longer through an application init...Prathamesh Sonpatki2016-07-1710-20/+32
| * | | | | | | Refactor the existing session_store to use keyword args and raise early when ...Prathamesh Sonpatki2016-07-171-9/+14
| * | | | | | | Introduce a new method for checking whether session_store is set by user or b...Prathamesh Sonpatki2016-07-171-0/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #25578 from kamipo/move_warning_about_composite_primary_ke...Rafael França2016-07-207-20/+39
|\ \ \ \ \ \ \
| * | | | | | | Move the warning about composite primary key to `AttributeMethods::PrimaryKey`Ryuta Kamizono2016-07-027-20/+39
* | | | | | | | Merge pull request #25520 from st0012/fix-current-pageRafael França2016-07-202-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix ActionView::Helpers#current_page? with issue in https://github.com/rails/...Stan Lo2016-07-202-0/+8
* | | | | | | | | Merge pull request #25889 from kamipo/do_not_dup_binds_in_to_sqlRafael França2016-07-201-1/+1
|\ \ \ \ \ \ \ \ \