aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove unused variable warningKuldeep Aggarwal2014-05-261-1/+1
| | | | `warning: assigned but unused variable - album`
* Merge pull request #15310 from tgxworld/small_refactor_get_routes_as_headCarlos Antonio da Silva2014-05-251-3/+1
|\ | | | | Remove unnecessary flatten! method call.
| * Remove unnecessary flatten! method call.Guo Xiang Tan2014-05-251-3/+1
| |
* | Merge pull request #15315 from JuanitoFatas/guides-guidelinesSantiago Pastorino2014-05-251-1/+1
|\ \ | | | | | | [ci skip] Update GFM link in guides guidelines.
| * | [ci skip] Update GFM link in guides guidelines.Juanito Fatas2014-05-251-1/+1
| |/ | | | | | | Also remove a duplicated sentence.
* | Merge pull request #15312 from JuanitoFatas/action_view/asset_pathYves Senn2014-05-251-1/+1
|\ \ | | | | | | Convert source to string if it is present.
| * | 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.
| * 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.
| * Remove unnecessary require of Minitest.Guo Xiang Tan2014-05-244-5/+2
| | | | | | | | Minitest has already been required when calling Minitest.autorun.
* | unwrap the constraints object on initialization, eliminate loopsAaron Patterson2014-05-244-3/+12
| | | | | | | | | | | | | | Unwrap Constraints objects. I don't actually think it's possible to pass a Constraints object to this constructor, but there were multiple places that kept testing children of this object. I *think* they were just being defensive, but I have no idea.
* | 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]
| * | 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
|/ / | | | | | | | | I don't know when this changed, checked back up to 3.2 and integration tests instantiate fixtures just fine.
* | Merge pull request #15303 from JohnKellyFerguson/guides-ar-queryingArthur Nogueira Neves2014-05-242-16/+41
|\ \ | | | | | | Improve readability of Explain Queries table in guides
| * | 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 engines
| * | 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 link fix and removing unused reader
| * | | documentation fixGaurav Sharma2014-05-241-2/+2
|/ / /
* | | Merge pull request #15298 from ShunsukeAida/fix_capitalizationRafael Mendonça França2014-05-241-1/+1
|\ \ \ | | | | | | | | fixed capitalization [ci skip]
| * | | 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 generators
| * | | avoid using alias in generatorsScott Bronson2013-01-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby's alias produces public methods, causing a spurious Thor task to be created.  For example, this is the reason MigrationGenerator currently has two tasks:     > ActiveRecord::Generators::MigrationGenerator.all_tasks.keys     => ["singular_name", "create_migration_file"] singular_name was meant to be an attribute, not a task.  Because it's public, it gets called as a task every time the generator is invoked. The fix is to ensure all generator methods have the correct visibility.
* | | | Merge pull request #13988 from zzak/guides_configuring_reverse_proxyZachary Scott2014-05-241-4/+38
|\ \ \ \ | | | | | | | | | | [Guides] Add documentation for using Rails with a reverse proxy [ci skip]
| * | | | 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: true Conflicts: actionpack/lib/action_dispatch/http/url.rb
| * | | | | Fixes URL generation with trailing_slash: trueDan Langevin2014-05-223-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URL generation with trailing_slash: true was adding a trailing slash after .:format Routes.draw do resources :bars end bars_url(trailing_slash: true, format: 'json') # => /bars.json/ This commit removes that extra trailing slash
* | | | | | pg, remove duplicated code.Yves Senn2014-05-241-4/+0
| | | | | |
* | | | | | pg, extract schema definitions into separate file.Yves Senn2014-05-242-135/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mirrors the layout of abstract adapter and puts the definitions inside the `PostgreSQL` namespace (no longer under the adapter namespace). /cc @kares
* | | | | | Revert "Merge pull request #15293 from ↵Yves Senn2014-05-241-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/generator-output-in-error" This reverts commit 7466d6a9f989a1a8f90899b79b34f1152e440b7c, reversing changes made to b850c4c540e8f0c15742f67c532f521a4a123655. This was an accidental merge. A new PR will follow. /cc @schneems
* | | | | | Merge pull request #15293 from schneems/schneems/generator-output-in-errorRichard Schneeman2014-05-241-12/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | print generators on failed generate
| * | | | | | print generators on failed generateschneems2014-05-241-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's say we just ran: ``` $ rails g migrate add_click_to_issue_assignment ``` We will get an error that looks like: ``` Could not find generator migrate. ``` This patch adds all existing migrations to the output to make it easier for a developer to find a valid migration. ``` Could not find generator "migrate". Please select a valid generator: Rails: assets controller generator helper integration_test mailer migration model resource scaffold scaffold_controller task ``` It would be nice to do some spelling detection and suggest alternatives, but for now this should help.
* | | | | | | Merge pull request #15278 from akshay-vishnoi/doc_changesAndrew White2014-05-241-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Improve doc for ModuleConstMissing.guess_for_anonymous
| * | | | | | | [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 scale
| * | | | | | | | 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 resources
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I know, it's crazy.
* | | | | | | | | | 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 c8ddb61 [ci skip]
| * | | | | | | | | Future port c8ddb61Zachary Scott2014-05-233-14/+14
| | | | | | | | | |
* | | | | | | | | | glob_param is never used, so rmAaron Patterson2014-05-233-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also changes the constructor. We don't need to pass more options than "defaults" (whatever defaults are, ugh. probably another hash of stupid stuff).
* | | | | | | | | | Merge pull request #15285 from ↵Rafael Mendonça França2014-05-232-9/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | sergey-alekseev/remove-active-record-where-duplicated-condition Remove duplicated parameter check on #where!
| * | | | | | | | | Remove duplicated parameter check on #where!Sergey Alekseev2014-05-232-9/+5
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that #where! is not designed to be used as a chained where. See initial implementation at 8c2c60511beaad05a218e73c4918ab89fb1804f0. So, no need to check twice. We should not test #where! https://github.com/rails/rails/pull/15285#discussion_r13018316
* | | | | | | | | Merge pull request #15283 from oismail91/improve_doc_for_select_tagRafael Mendonça França2014-05-231-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | update select_tag docs for customizing id
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:05:15 +0000