Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | Copy edits for primary_key documentation in association guide. [ci skip] | Zachary Scott | 2015-04-10 | 1 | -3/+4 | |
| * | | | | | | | | | | | Merge branch 'belongs_to_primary_key_doc' of https://github.com/girishso/rail... | Zachary Scott | 2015-04-10 | 1 | -0/+19 | |
|/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | added primary_key option documentation for belongs_to association | Girish S | 2014-09-23 | 1 | -0/+19 | |
* | | | | | | | | | | | | Merge pull request #17512 from JackDanger/danger/use-default-view-pattern-in-... | Zachary Scott | 2015-04-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Using the real resolver pattern in docs | Jack Danger Canty | 2014-11-04 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Copy edits for QueueAdapters docs to fix #17765 [ci skip] | Zachary Scott | 2015-04-10 | 1 | -18/+18 | |
* | | | | | | | | | | | | | Merge branch 'queue-adapters-docs' of https://github.com/KingsleyKelly/rails ... | Zachary Scott | 2015-04-10 | 1 | -0/+56 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | [ci skip] Adds documentation explaining table labels for Active Job QueueAdap... | KingsleyKelly | 2015-04-09 | 1 | -7/+47 | |
| * | | | | | | | | | | | | | [ci skip] Adds rdoc for priority explaining what the labels in the table means. | KingsleyKelly | 2015-04-06 | 1 | -0/+16 | |
* | | | | | | | | | | | | | | Merge pull request #19722 from sikachu/remove-ar-use_transactional_fixtures | Guillermo Iguaran | 2015-04-10 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Use `use_transactional_tests` in Active Record | Prem Sichanugrist | 2015-04-10 | 2 | -2/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #19716 from yui-knk/fix/filter_name | Zachary Scott | 2015-04-09 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | [ci skip] Downcases filter names | yui-knk | 2015-04-10 | 1 | -3/+3 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #19689 from marutosi/master-issue-19187 | Rafael Mendonça França | 2015-04-09 | 5 | -4/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | [Rails4 regression] prevent thin and puma cause error in Non ASCII URL on Win... | Toshi MARUYAMA | 2015-04-09 | 2 | -1/+23 | |
| * | | | | | | | | | | | | | wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rb | Toshi MARUYAMA | 2015-04-09 | 1 | -1/+5 | |
| * | | | | | | | | | | | | | Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt" on Linux | Toshi MARUYAMA | 2015-04-09 | 2 | -2/+11 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #19712 from eliotsykes/active-job-config-guide | Rafael Mendonça França | 2015-04-09 | 2 | -0/+60 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add Active Job to Configuring Guide [ci skip] | Eliot Sykes | 2015-04-09 | 2 | -0/+60 | |
* | | | | | | | | | | | | | | Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_e... | Rafael Mendonça França | 2015-04-09 | 3 | -3/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | fix fails to force_ssl_redirection if session_store is disabled | Taishi Kasuga | 2015-04-09 | 3 | -3/+31 | |
* | | | | | | | | | | | | | | | Merge pull request #19703 from vizcay/fix_code_statics | Rafael Mendonça França | 2015-04-09 | 2 | -4/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | bugfix CodeStatics#calculate_directory_statics when dir has source extension | Pablo Vizcay | 2015-04-09 | 2 | -4/+22 | |
| |/ / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / | redcarpet 3.2.2 has an XSS vulnerability | Akira Matsuda | 2015-04-09 | 2 | -3/+3 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #19700 from tancnle/trivial-shallow-nesting-depth-count | Rafael Mendonça França | 2015-04-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | A shorter and more concise version of select..size | Tan Le | 2015-04-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Disable Active Job intregration tests. | Rafael Mendonça França | 2015-04-08 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | Merge pull request #19685 from vngrs/actionview_parent_layout_bug | Rafael Mendonça França | 2015-04-08 | 2 | -8/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | fix for actionview parent layout bug | Mehmet Emin İNAÇ | 2015-04-08 | 2 | -8/+31 | |
* | | | | | | | | | | | | | | | Merge pull request #19633 from y00rb/sort_router_parameters_duplicated_keys | Rafael Mendonça França | 2015-04-08 | 4 | -2/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | sort_by instead of sort | Yang Bo | 2015-04-08 | 4 | -2/+42 | |
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19694 from eagletmt/file-store-clear | Rafael Mendonça França | 2015-04-08 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Allow AS::Cache::FileStore#clear without cache directory | Kohei Suzuki | 2015-04-09 | 2 | -0/+7 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19698 from stemps/master | Rafael Mendonça França | 2015-04-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fix documentation for SchemaStatements#add_foreign_key | Simon Stemplinger | 2015-04-08 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19324 from arthurnn/batch_touch | Arthur Nogueira Neves | 2015-04-08 | 7 | -7/+172 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Batch touch parent records | Arthur Neves | 2015-04-08 | 7 | -7/+172 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'fix_uniqueness_validation_when_value_is_out_of_range' | Sean Griffin | 2015-04-08 | 3 | -0/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix uniqueness validation with out of range value | Andrey Voronkov | 2015-04-08 | 3 | -0/+31 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Avoid to define an initializer after the load_config_initializers | Rafael Mendonça França | 2015-04-07 | 3 | -8/+9 | |
* | | | | | | | | | | | | | | Merge pull request #19677 from treble37/update-docs-ActionDispatch__Request__... | schneems | 2015-04-07 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | remove new line between doc and method | Bruce Park | 2015-04-07 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | added docs for ActionDispatch::Request::Session#create | Bruce Park | 2015-04-07 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | Merge pull request #19680 from vngrs/make_join_model_name_const_private | Rafael Mendonça França | 2015-04-07 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Change join model name constant to private constant | Mehmet Emin İNAÇ | 2015-04-07 | 1 | -3/+1 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #17574 from kamipo/charset_collation_options | Jeremy Kemper | 2015-04-07 | 8 | -19/+172 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add `:charset` and `:collation` options support for MySQL string and text col... | Ryuta Kamizono | 2015-03-06 | 8 | -19/+172 | |
* | | | | | | | | | | | | | | | Merge pull request #19661 from Azdaroth/fields-for-child-index-lambda | Rafael Mendonça França | 2015-04-06 | 3 | -1/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Accept lambda as child_index option in #fields_for method | Karol Galanciak | 2015-04-05 | 3 | -1/+26 | |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19647 from codeout/association_update | Rafael Mendonça França | 2015-04-06 | 2 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |