aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Call get_routes_as_head only on HEAD requests.Guo Xiang Tan2014-05-251-1/+4
* Merge pull request #15315 from JuanitoFatas/guides-guidelinesSantiago Pastorino2014-05-251-1/+1
|\
| * [ci skip] Update GFM link in guides guidelines.Juanito Fatas2014-05-251-1/+1
* | Merge pull request #15312 from JuanitoFatas/action_view/asset_pathYves Senn2014-05-251-1/+1
|\ \
| * | Convert source to string if it is present.Juanito Fatas2014-05-251-1/+1
| |/
* | Merge pull request #15311 from zuhao/refactor_actionpack_bare_metal_testYves Senn2014-05-251-2/+2
|\ \ | |/ |/|
| * The correct status to test should be :switching_protocols.Zuhao Wan2014-05-251-2/+2
|/
* Merge pull request #15305 from tgxworld/remove_unnecessary_requireGuillermo Iguaran2014-05-244-5/+2
|\
| * Remove unnecessary require of Minitest.Guo Xiang Tan2014-05-244-5/+2
* | unwrap the constraints object on initialization, eliminate loopsAaron Patterson2014-05-244-3/+12
* | Merge pull request #15304 from JohnKellyFerguson/guides-4.1.1Xavier Noria2014-05-256-58/+61
|\ \
| * | Update all Rails 4.1.0 references in guides to 4.1.1 [ci skip]John Kelly Ferguson2014-05-246-58/+61
* | | integration tests do not need to load fixtures by handXavier Noria2014-05-253-11/+0
|/ /
* | Merge pull request #15303 from JohnKellyFerguson/guides-ar-queryingArthur Nogueira Neves2014-05-242-16/+41
|\ \
| * | Improve readability of Explain Queries table in guides [ci skip]John Kelly Ferguson2014-05-242-16/+41
|/ /
* | Merge pull request #15299 from andriytyurnikov/engine_friendly_rake_statsRafael Mendonça França2014-05-242-19/+24
|\ \
| * | rake stats for enginesAndriy Tyurnikov2014-05-242-19/+24
* | | Merge pull request #15264 from Gaurav2728/gaurav-documentation_fixRafael Mendonça França2014-05-241-2/+2
|\ \ \
| * | | documentation fixGaurav Sharma2014-05-241-2/+2
|/ / /
* | | Merge pull request #15298 from ShunsukeAida/fix_capitalizationRafael Mendonça França2014-05-241-1/+1
|\ \ \
| * | | fixed capitalizationShunsukeAida2014-05-251-1/+1
* | | | Add FIXME note about the thor bugRafael Mendonça França2014-05-241-0/+2
* | | | Merge pull request #9083 from bronson/patch-1Rafael Mendonça França2014-05-241-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | avoid using alias in generatorsScott Bronson2013-01-251-1/+4
* | | | Merge pull request #13988 from zzak/guides_configuring_reverse_proxyZachary Scott2014-05-241-4/+38
|\ \ \ \
| * | | | Add documentation for using Rails with a reverse proxyZachary Scott2014-05-241-4/+38
* | | | | Merge pull request #14986 from dlangevin/trailing-slash-url-generationRafael Mendonça França2014-05-243-7/+37
|\ \ \ \ \
| * | | | | Fixes URL generation with trailing_slash: trueDan Langevin2014-05-223-9/+40
* | | | | | pg, remove duplicated code.Yves Senn2014-05-241-4/+0
* | | | | | pg, extract schema definitions into separate file.Yves Senn2014-05-242-135/+141
* | | | | | Revert "Merge pull request #15293 from schneems/schneems/generator-output-in-...Yves Senn2014-05-241-16/+12
* | | | | | Merge pull request #15293 from schneems/schneems/generator-output-in-errorRichard Schneeman2014-05-241-12/+16
|\ \ \ \ \ \
| * | | | | | print generators on failed generateschneems2014-05-241-12/+16
* | | | | | | Merge pull request #15278 from akshay-vishnoi/doc_changesAndrew White2014-05-241-4/+5
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Improve doc for ModuleConstMissing.guess_for_anonymousAkshay Vishnoi2014-05-241-4/+5
* | | | | | | | Merge pull request #15290 from sgrif/sg-consolidate-zero-scale-decimalRafael Mendonça França2014-05-236-41/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove special case in schema dumper for decimal without scaleSean Griffin2014-05-236-41/+42
* | | | | | | | | Merge pull request #15291 from francocatena/router-visualizer-fixRafael Mendonça França2014-05-231-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix router visualizer CSS and JS resourcesFranco Catena2014-05-231-2/+2
* | | | | | | | | | Constraints contructor should always return a Constraints objectAaron Patterson2014-05-231-9/+5
* | | | | | | | | | default value is never used, so make it requiredAaron Patterson2014-05-231-1/+1
* | | | | | | | | | push options decomposition up so we can extractAaron Patterson2014-05-231-20/+13
|/ / / / / / / / /
* | | | | | | | | Merge pull request #15289 from zzak/future_port_c8ddb61Godfrey Chan2014-05-233-14/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Future port c8ddb61Zachary Scott2014-05-233-14/+14
* | | | | | | | | | glob_param is never used, so rmAaron Patterson2014-05-233-10/+8
* | | | | | | | | | Merge pull request #15285 from sergey-alekseev/remove-active-record-where-dup...Rafael Mendonça França2014-05-232-9/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove duplicated parameter check on #where!Sergey Alekseev2014-05-232-9/+5
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #15283 from oismail91/improve_doc_for_select_tagRafael Mendonça França2014-05-231-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | update docs to include html id for select_tagOmar Ismail2014-05-231-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #15277 from sgrif/sg-schema-cache-refactorRafael Mendonça França2014-05-231-31/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |