aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19904 from zzak/rm_route_wrapper_internal_hacksRafael Mendonça França2015-04-261-0/+16
|\ | | | | Rm route wrapper internal hacks
| * Remove internal hacks dependent on Sprockets from RouteWrapperZachary Scott2015-04-251-5/+1
| |
| * Fix rake routes for api appsJorge Bejar2015-04-252-1/+21
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Need to add config.assets.compile=true to access `.assets`Arthur Neves2015-04-261-0/+1
| | | | | | | | | | | | sprockets-rails will only add `Rails.application.assets` if compile is no false. See change on sprockets-rails https://github.com/rails/sprockets-rails/commit/d7c7ee19991c565eb77ee143be2d009ba4472122
* | assets:cache:clean wont clean cache anymoreArthur Neves2015-04-261-11/+0
| | | | | | | | | | See the behaviour change on sprockets-rails https://github.com/rails/sprockets-rails/commit/56725e5843662189c6701478f7598db306d5fb02
* | Use latest sprockets-rails on internal devArthur Neves2015-04-262-7/+15
| |
* | Don't reference sprockets assets on action packArthur Neves2015-04-261-1/+1
| | | | | | | | | | | | | | | | We need to ignore the `assets_prefix` when running a command like `rake routes`. However we cannot reference asserts_prefix from action_pack as that is a sprockets-rails concern. See this is now implemented on sprockets-rails https://github.com/rails/sprockets-rails/commit/85b89c44ad40af3056899808475e6e4bf65c1f5a
* | Merge pull request #19909 from prathamesh-sonpatki/rm-unused-codeCarlos Antonio da Silva2015-04-261-17/+0
|\ \ | | | | | | Removed unused code from request_forgery_protection tests
| * | Removed unused code from request_forgery_protection testsPrathamesh Sonpatki2015-04-261-17/+0
|/ /
* | Merge pull request #19905 from prathamesh-sonpatki/no-readme-linkRafael Mendonça França2015-04-261-1/+1
|\ \ | |/ |/| Escape README in Plugin builder API documentation
| * Escape README in Plugin builder API documentationPrathamesh Sonpatki2015-04-261-1/+1
|/ | | | | - So that RDoc will not generate link for README. [ci skip]
* Merge pull request #19884 from chancancode/uncomment-byebugGodfrey Chan2015-04-262-1/+5
|\ | | | | Uncomment byebug in framework Gemfile
| * Uncomment byebug in framework GemfileGodfrey Chan2015-04-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | History: 1. `debugger` was there until d2ed433b where it was commented out, and I couldn't figure out why 2. Since then we inherited that when switching to `byebug` in 93559da4 Reasons: 1. It's nice to have a debugger when working on framework bugs 2. It's an uncommented dependency in app Gemfiles since Rails 4.2 (see fbe38c9e)
* | Merge pull request #19902 from khundawg/dm-active-support-subsciber-docRichard Schneeman2015-04-251-2/+2
|\ \ | | | | | | [ci skip] Update ActiveSupport::Subscriber documentation
| * | [ci skip] Update ActiveSupport::Subscriber documentationDAVID MOORE2015-04-251-2/+2
| | |
* | | Revert "Fix multiple suggestion test"Arthur Neves2015-04-251-1/+1
| | | | | | | | | | | | This reverts commit 6a7cf515123889360d272e8ab4be045578dfc0fb.
* | | Fix multiple suggestion testArthur Neves2015-04-251-1/+1
| | |
* | | Add test for multiple suggested generator names.Josef Šimánek2015-04-251-0/+6
| | |
* | | Merge pull request #19892 from derekprior/dp-translate-helper-docsZachary Scott2015-04-251-23/+36
|\ \ \ | | | | | | | | Correct translate helper docs [ci skip]
| * | | Correct translate helper docs [ci skip]Derek Prior2015-04-241-23/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation previously stated that calling `translate(".foo")` was equivalent to calling `I18n.translate("people.index.foo")` which is incorrect due to the various other functions of the `translate` view helper. This has been fixed. Additionally, a note about forcing the view helper to re-raise exceptions was added to the section detailing the handling of missing translations. Other cleanup includes: * Consistent formatting of code * Stop indenting bulleted list as a code sample * Tighten some of the language * Wrap at 80 characters.
* | | | Merge pull request #19899 from tgxworld/fix_docArthur Nogueira Neves2015-04-251-2/+2
|\ \ \ \ | | | | | | | | | | No need to capitalize verbs. [CI SKIP]
| * | | | No need to capitalize verbs. [CI SKIP]Guo Xiang Tan2015-04-261-2/+2
|/ / / /
* | | | Minor edits to the "Action View Overview" guideRobin Dupret2015-04-251-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | Follow-up to #19672 and 8b0aa0c1. [ci skip]
* | | | :put_litter_in_its_place: Unused methodsAkira Matsuda2015-04-252-12/+0
| | | |
* | | | :put_litter_in_its_place: Unused methodAkira Matsuda2015-04-251-6/+0
| | | | | | | | | | | | | | | | This method is not in use since 479c7cacd5db58ab7200bc1de58c829a1a643278
* | | | Why do we add a top-level constant here?Akira Matsuda2015-04-252-9/+5
| | | |
* | | | Do not show --helper and --assets options in the controller generator helpAkira Matsuda2015-04-251-1/+2
| | | | | | | | | | | | | | | | | | | | These options are not actually available. Thanks @soutaro for letting me aware of this.
* | | | Merge pull request #19894 from thenickcox/deprecated_proxy_docsZachary Scott2015-04-241-22/+38
|\ \ \ \ | | | | | | | | | | [ci skip] Rework docs, add examples on deprecation proxies
| * | | | [ci skip] Rework docs, add examples on deprecation proxiesNick Cox2015-04-241-22/+38
| |/ / /
* | | | Merge pull request #19236 from sshaw/more_tagged_logging_docsYves Senn2015-04-242-1/+4
|\ \ \ \ | | | | | | | | | | More docs on tagged logging [ci skip]
| * | | | Refer to the constructer argument in docsSkye Shaw2015-04-241-1/+1
| | | | |
| * | | | More docs on tagged logging [ci skip]sshaw2015-03-062-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Mention that tags can also come from a Proc that accepts the request object or something's to_s method
* | | | | Merge pull request #19888 from imtayadeway/tw/attribute-methods-docsClaudio B.2015-04-241-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix grammar/style in attribute methods docs
| * | | | | Fix grammar/style: assigns/declares -> assignments/declarations.Tim Wade2015-04-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Fix grammar/style: use (v) fall back (on).Tim Wade2015-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Fix grammar/style: break up long sentence.Tim Wade2015-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A conjunction was needed to make these sentences correct. Breaking them up seemed like a better option. [ci skip]
| * | | | | Fix grammar/style: pluralize 'each of its method'Tim Wade2015-04-241-1/+1
| | |/ / / | |/| | | | | | | | | | | | | [ci skip]
* | | | | use a more descriptive example. [ci skip]Yves Senn2015-04-241-6/+4
| | | | | | | | | | | | | | | | | | | | follow up to 107526e809ea2b6de8b2775ecf83e55d60833206
* | | | | docs for `create_table` and non-int primary keys. [ci skip]Yves Senn2015-04-241-0/+17
|/ / / /
* | | | Merge pull request #19881 from sikachu/silence-mysql-errno-warningRafael Mendonça França2015-04-231-1/+3
|\ \ \ \ | | | | | | | | | | Silence warning from MySQL::Error object in test
| * | | | Silence warning from MySQL::Error object in testPrem Sichanugrist2015-04-231-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running Active Record MySQL test, this warning is printed in the console: warning: instance variable errno not initialized It turns out that this is a warning from `mysql` gem in MySQL::Error object. However, since the `mysql` gem is no longer maintained, and there won't be a newer version, it make sense for us to just silence this warning to make the output cleaner.
* | | | Merge pull request #19879 from bboe/RedirectTestCleanupRafael Mendonça França2015-04-231-3/+0
|\ \ \ \ | | | | | | | | | | Remove unused WorkshopsController class in redirect_test.
| * | | | Remove unused WorkshopsController class in redirect_test.Bryce Boe2015-04-231-3/+0
| | | | |
* | | | | Remove nonexistent adapterRafael Mendonça França2015-04-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19866 [ci skip]
* | | | | Add nodoc to some private constants [ci skip]Rafael Mendonça França2015-04-231-3/+3
| | | | |
* | | | | Merge pull request #19823 from sbhatore/doc_fix_1Rafael Mendonça França2015-04-231-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Description inside Signed and Encrypted CookieJars added
| * | | | Squashed commit of the following:Siddharth Bhatore2015-04-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit a88875ac6abaa4d8116b42af8cd71189ce3d44d3 Author: Siddharth Bhatore <sbhatore95@gmail.com> Date: Thu Apr 23 12:26:08 2015 +0530 [ci skip] Update doc fix cookies commit f175eaa7a21db898fc6c66334f770831028f9d00 Author: Siddharth Bhatore <sbhatore95@gmail.com> Date: Mon Apr 20 12:58:04 2015 +0530 Description inside Signed and Encrypted CookieJars added
* | | | | Merge pull request #18880 from mudge/timestamp-index-bugRafael Mendonça França2015-04-233-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix missing index when using timestamps with index
| * | | | | Fix missing index when using timestamps with indexPaul Mucur2015-04-153-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `index` option used with `timestamps` should be passed to both `column` definitions for `created_at` and `updated_at` rather than just the first. This was happening because `Hash#delete` is used to extract the `index` option passed to `timestamps`, thereby mutating the `options` hash in-place. Now take a copy of the `options` before deleting so that the original is not modified.
* | | | | | Merge pull request #19875 from cllns/fix-css-formatting-in-welcome-indexRafael Mendonça França2015-04-231-3/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix CSS formatting in welcome#index.html.erb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:56:22 +0000