Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #21040 from aditya-kapoor/fix-typo | Arthur Nogueira Neves | 2015-07-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ci skip] it should be protect_from_forgery | Aditya Kapoor | 2015-07-27 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #21003 from robin850/api-plugins | Rafael Mendonça França | 2015-07-27 | 5 | -9/+84 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Enable the `api_only` option for API plugins' generators | Robin Dupret | 2015-07-23 | 2 | -0/+27 | |
| * | | | | | | | | | | | Generate an API dummy application for API plugins | Robin Dupret | 2015-07-23 | 2 | -0/+9 | |
| * | | | | | | | | | | | Make ApplicationController inherit from AC::API for API plugins | Robin Dupret | 2015-07-23 | 2 | -1/+9 | |
| * | | | | | | | | | | | Skip assets, helpers and views generation for API plugins | Robin Dupret | 2015-07-23 | 2 | -8/+27 | |
| * | | | | | | | | | | | Add the `--api` option for the plugin generator | Robin Dupret | 2015-07-23 | 2 | -0/+12 | |
* | | | | | | | | | | | | Merge pull request #21035 from radar/ryan-bigg-has-changed-jobs | Godfrey Chan | 2015-07-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Ryan Bigg has changed jobs. | Ryan Bigg | 2015-07-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #21030 from yahonda/mysql2_20969 | Kasper Timm Hansen | 2015-07-26 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove @connection instance variable only when defined | Yasuo Honda | 2015-07-26 | 1 | -2/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Properly allow uniqueness validations on primary keys. | Sean Griffin | 2015-07-25 | 3 | -1/+28 | |
* | | | | | | | | | | | | Merge pull request #21007 from clayton-shopify/fix-mailto-encoding | Rafael Mendonça França | 2015-07-24 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Encode the email address as prescribed in RFC 6068 section 2. | Clayton Smith | 2015-07-23 | 2 | -1/+9 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | `destroy` shouldn't raise when child associations fail to save | Sean Griffin | 2015-07-24 | 4 | -1/+48 | |
* | | | | | | | | | | | | Merge pull request #20256 from arunagw/aa-remove-unused-rule-and-task-activer... | Sean Griffin | 2015-07-24 | 1 | -9/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove unused rule and task from activerecord | Arun Agrawal | 2015-05-22 | 1 | -9/+0 | |
* | | | | | | | | | | | | | Merge pull request #20928 from matthewd/unload-interlock | Matthew Draper | 2015-07-24 | 5 | -35/+385 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Small tweaks to mainly lock-ordering tests. | thedarkone | 2015-07-22 | 1 | -21/+58 | |
| * | | | | | | | | | | | | Handle thread death during lock acquisition | Matthew Draper | 2015-07-21 | 2 | -4/+27 | |
| * | | | | | | | | | | | | Adjust expectations around purpose/compatibility options | Matthew Draper | 2015-07-21 | 2 | -9/+36 | |
| * | | | | | | | | | | | | Add some meta-assertions for the custom assertions | Matthew Draper | 2015-07-21 | 1 | -11/+63 | |
| * | | | | | | | | | | | | Order of execution is only guaranteed if upgrading | Matthew Draper | 2015-07-21 | 2 | -2/+4 | |
| * | | | | | | | | | | | | Fix ShareLock issues. | thedarkone | 2015-07-20 | 1 | -2/+2 | |
| * | | | | | | | | | | | | Tests for AS::Concurrency::ShareLock. | thedarkone | 2015-07-20 | 1 | -0/+194 | |
| * | | | | | | | | | | | | We need stricter locking before we can unload | Matthew Draper | 2015-07-20 | 4 | -34/+49 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Remove ivar only when defined | Akira Matsuda | 2015-07-24 | 1 | -2/+2 | |
| |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Improvements on the enum documentation [ci skip] | Robin Dupret | 2015-07-23 | 1 | -9/+11 | |
| |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #20999 from robin850/enum-prefix-suffix | Kasper Timm Hansen | 2015-07-23 | 3 | -15/+15 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Rename the enum_{prefix,suffix} options to _{prefix,suffix} | Robin Dupret | 2015-07-23 | 3 | -15/+15 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #20993 from budnik/patch-1 | Robin Dupret | 2015-07-23 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | Fixes documentation typo. | Дмитро Будник | 2015-07-23 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20989 from matthewd/no-lock-basic-require | Matthew Draper | 2015-07-23 | 1 | -6/+4 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Don't apply locking around basic #load / #require | Matthew Draper | 2015-07-23 | 1 | -6/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | rm `deep_munge`. You will live on in our hearts (and git history) | Aaron Patterson | 2015-07-21 | 3 | -26/+15 | |
* | | | | | | | push param encoding in to the utils module | Aaron Patterson | 2015-07-21 | 2 | -14/+30 | |
* | | | | | | | stop keeping track of keys when "deep munging" | Aaron Patterson | 2015-07-21 | 1 | -5/+3 | |
* | | | | | | | recurse for arrays in `normalize_encode_params` | Aaron Patterson | 2015-07-21 | 1 | -5/+3 | |
* | | | | | | | drop conditionals in conversion logic | Aaron Patterson | 2015-07-21 | 1 | -7/+5 | |
* | | | | | | | rearrange logic to use positive branches | Aaron Patterson | 2015-07-21 | 1 | -4/+6 | |
* | | | | | | | Merge pull request #20973 from vngrs/fix_rails_tests | Rafael Mendonça França | 2015-07-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | fix rails tests | Mehmet Emin İNAÇ | 2015-07-21 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #20967 from lxsameer/record_not_found | Rafael Mendonça França | 2015-07-21 | 5 | -5/+35 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Extra caller details added to ActiveRecord::RecordNotFound | Sameer Rahmani | 2015-07-21 | 5 | -5/+35 | |
* | | | | | | | Merge pull request #20926 from rsanheim/fail-fast-bin-setup | Rafael Mendonça França | 2015-07-21 | 1 | -5/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add system! to fail fast in bin/setup | Rob Sanheim | 2015-07-18 | 1 | -5/+9 | |
* | | | | | | | | Merge pull request #20819 from y-yagi/rails_api_gemfile | Rafael Mendonça França | 2015-07-21 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | remove `web-console` from API app generated Gemfile | yuuji.yaginuma | 2015-07-09 | 2 | -1/+4 | |
* | | | | | | | | Merge pull request #20668 from repinel/rename-restrict-dependent-destroy-i18n... | Rafael Mendonça França | 2015-07-21 | 6 | -4/+73 | |
|\ \ \ \ \ \ \ \ |