aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Simplify the code in schema cacheSean Griffin2014-05-231-31/+11
* | | | | | | | | | | | | | Merge pull request #15261 from hbin/missing_parametersRafael Mendonça França2014-05-231-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bring the missing parameters back.Bin Huang2014-05-231-1/+5
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | use Proc.new to automatically do parameter checking for usAaron Patterson2014-05-231-3/+1
* | | | | | | | | | | | | | Merge pull request #15282 from sgrif/sg-remove-column-primaryRafael Mendonça França2014-05-237-52/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove `Column#primary`Sean Griffin2014-05-237-52/+10
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #15276 from kuldeepaggarwal/fix-array-toRafael Mendonça França2014-05-232-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | revert 96525d63Kuldeep Aggarwal2014-05-232-1/+5
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #15265 from danielmbarlow/masterRafael Mendonça França2014-05-231-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added force_reload to Auto-generated methods docdanielmbarlow2014-05-231-2/+3
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #15280 from sgrif/sg-postgres-defaultsRafael Mendonça França2014-05-233-76/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Move parsing of PG sql strings for defaults out of columnSean Griffin2014-05-233-76/+78
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #15275 from kuldeepaggarwal/add-testRafael Mendonça França2014-05-232-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add test cases for negative position in Array#fromKuldeep Aggarwal2014-05-232-0/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | there is no formatter on the router object, so rmAaron Patterson2014-05-231-1/+0
* | | | | | | | | | | | | | Merge pull request #15271 from sgrif/sg-remove-duplicated-setupRafael Mendonça França2014-05-231-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove duplicated setup in testSean Griffin2014-05-231-4/+3
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #15273 from DNNX/formatter-refactoring-4Rafael Mendonça França2014-05-231-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove AD::Journey::Formatter#verify_required_parts!Viktar Basharymau2014-05-231-5/+0
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | decouple the router object from the request classAaron Patterson2014-05-233-21/+10
* | | | | | | | | | | | | | pass the correct custom request to the recognize methodAaron Patterson2014-05-233-17/+12
* | | | | | | | | | | | | | switch to the `serve` method so we can remove the request class (eventually)Aaron Patterson2014-05-232-8/+6
* | | | | | | | | | | | | | pull request allocation up one frameAaron Patterson2014-05-231-1/+3
* | | | | | | | | | | | | | extract request allocation from the main app serving routineAaron Patterson2014-05-232-2/+5