Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #16844 from zerothabhishek/master | Rafael Mendonça França | 2014-09-16 | 1 | -4/+33 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [guides] 4.2 release notes: added technical details for Adequate Record | abhishek | 2014-09-16 | 1 | -4/+33 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #16841 from tjouan/environment-config-consistency | Rafael Mendonça França | 2014-09-16 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Improve environment config templates consistency: | Thibault Jouan | 2014-09-16 | 1 | -3/+4 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #16790 from cirosantilli/explain-erb-space-removal | Rafael Mendonça França | 2014-09-16 | 1 | -1/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Explain ERB space removal. [ci skip] | Ciro Santilli | 2014-09-11 | 1 | -1/+3 | |
* | | | | | | | Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_error | Rafael Mendonça França | 2014-09-16 | 3 | -2/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use dynamic path for dummy app location in plugin's test_helper.rb | Yukio Mizuta | 2014-09-14 | 3 | -2/+10 | |
* | | | | | | | | Make explicit 4.1 is being maintained by a special situation | Rafael Mendonça França | 2014-09-16 | 1 | -1/+4 | |
| |_|_|_|/ / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #16927 from akshay-vishnoi/fix-typo | Rafael Mendonça França | 2014-09-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] Fix typo `equals to` --> `equal to` | Akshay Vishnoi | 2014-09-16 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | As of Unicode 6.3, Mongolian Vowel Separator is not whitespace | Matthew Draper | 2014-09-15 | 4 | -6/+5 | |
* | | | | | | Merge pull request #16574 from lsylvester/duration-respond_to | Jeremy Kemper | 2014-09-14 | 3 | -2/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add implementation of respond_to? for ActiveSupport::Duration | lsylvester | 2014-09-15 | 3 | -2/+19 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #16922 from y-yagi/add_test_jobs_task | Godfrey Chan | 2014-09-15 | 2 | -6/+17 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add `test:jobs` task | yuuji.yaginuma | 2014-09-15 | 2 | -6/+17 | |
* | | | | | | | handle <%== nil %> cases | Aaron Patterson | 2014-09-14 | 4 | -2/+12 | |
* | | | | | | | Merge pull request #16920 from seuros/aj | Jeremy Kemper | 2014-09-14 | 1 | -43/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | simplify test_adapter | Abdelkader Boudih | 2014-09-14 | 1 | -43/+4 | |
* | | | | | | | | Merge pull request #16918 from kiuru/master | Abdelkader Boudih | 2014-09-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Singular credit_card controller name changed to plural | Niko Kiuru | 2014-09-14 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Tighten up AJ::Arguments and its tests | Jeremy Kemper | 2014-09-14 | 3 | -85/+90 | |
* | | | | | | | Pare down and simplify Active Job's rake tasks | Jeremy Kemper | 2014-09-14 | 2 | -59/+34 | |
* | | | | | | | Stop nil checking on safe_append= | Aaron Patterson | 2014-09-14 | 1 | -4/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #16912 from yuki24/rescue-rack-parameter-type-error | Jeremy Kemper | 2014-09-13 | 2 | -5/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Rescue Rack::Utils::ParameterTypeError instead of TypeError | Yuki Nishijima | 2014-09-13 | 2 | -5/+5 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #16758 from Agis-/time-change-nsec | Jeremy Kemper | 2014-09-13 | 3 | -6/+25 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Time#change can now change nanoseconds (:nsec) | Agis- | 2014-09-14 | 3 | -6/+25 | |
* | | | | | | Merge pull request #16910 from kuldeepaggarwal/use-rails-options | Santiago Pastorino | 2014-09-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | use `allow_blank` option instead | Kuldeep Aggarwal | 2014-09-14 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #13656 from chanks/rollback_transactions_in_killed_threads | Matthew Draper | 2014-09-14 | 3 | -5/+50 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Roll back open transactions when the running thread is killed. | Chris Hanks | 2014-08-22 | 2 | -1/+36 | |
* | | | | | | | Revert "Merge pull request #15312 from JuanitoFatas/action_view/asset_path" | Matthew Draper | 2014-09-14 | 2 | -1/+12 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #16908 from y-yagi/change_activejob_test_dir | Abdelkader Boudih | 2014-09-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Change ActiveJob test directory to "test/jobs" | yuuji.yaginuma | 2014-09-13 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #16669 from aantix/dangerous_attribute_error_better_message | Rafael Mendonça França | 2014-09-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Changed the DangerousAttributeError exception message to include messaging th... | Jim Jones | 2014-09-10 | 1 | -1/+1 | |
* | | | | | | | Prepare maintenance policy for 4.2 release [ci skip] | Rafael Mendonça França | 2014-09-12 | 1 | -3/+3 | |
* | | | | | | | Se the test order of activejob tests | Rafael Mendonça França | 2014-09-12 | 1 | -1/+1 | |
* | | | | | | | Change gid calls to to_gid | Rafael Mendonça França | 2014-09-12 | 1 | -8/+8 | |
* | | | | | | | Merge pull request #16897 from kostia/message-varifier-raises-exception-on-ni... | Rafael Mendonça França | 2014-09-12 | 3 | -0/+13 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Changes "if secret.nil?" to unless secret in MessageVerfier | Kostiantyn Kahanskyi | 2014-09-12 | 1 | -1/+1 | |
| * | | | | | | | MessageVerifier raises an appropriate exception if the secret is nil | Kostiantyn Kahanskyi | 2014-09-12 | 3 | -0/+13 | |
* | | | | | | | | Globalid was released | Rafael Mendonça França | 2014-09-12 | 1 | -2/+0 | |
* | | | | | | | | Use latest globalid | Rafael Mendonça França | 2014-09-12 | 1 | -1/+2 | |
* | | | | | | | | Merge pull request #16890 from seuros/globalid | Rafael Mendonça França | 2014-09-12 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Bump globalid version | Abdelkader Boudih | 2014-09-12 | 2 | -2/+2 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #16896 from seuros/revert-16895-suck1-1 | Santiago Pastorino | 2014-09-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Revert "lock suckerpunch version to 1.1" | Abdelkader Boudih | 2014-09-12 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #16898 from brandonhilkert/master | Santiago Pastorino | 2014-09-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |