aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25421 from maclover7/jm-mv-filesSean Griffin2016-06-172-0/+0
|\
| * Move code style configuration files to root directoryJon Moss2016-06-162-0/+0
|/
* Merge pull request #24773 from ralinc/fix-silent-fail-on-psql-commandArthur Nogueira Neves2016-06-163-3/+18
|\
| * PostgreSQL: Fix db:structure:load silent failure on SQL errorRalin Chimev2016-05-103-3/+18
* | Move quiet option to development.rbRafael Mendonça França2016-06-162-3/+3
* | Merge pull request #25411 from javan/fix-digesting-different-formatsMatthew Draper2016-06-175-6/+49
|\ \
| * | Add test for nested html dependencies with same logical name as templates for...Javan Makhmali2016-06-151-2/+6
| * | Move and rename testJavan Makhmali2016-06-151-7/+7
| * | Fix finding templates for digesting for */* requests that render a non-defaul...Javan Makhmali2016-06-154-3/+30
| * | Explicity find with the rendered format to handle searching multiple view pat...Javan Makhmali2016-06-153-4/+2
| * | Fix digesting templates with identical logical names when requesting a format...Javan Makhmali2016-06-153-4/+18
* | | Merge pull request #25416 from alexcameron89/masterRafael França2016-06-161-2/+0
|\ \ \ | |/ / |/| |
| * | [ci skip] Remove duplicate alias documentation in ActiveModel::ValidationsAlex Kitchens2016-06-161-2/+0
|/ /
* | Merge pull request #25271 from kamipo/prevent_range_error_for_existsSean Griffin2016-06-153-10/+6
|\ \
| * | Prevent `RangeError` for `FinderMethods#exists?`Ryuta Kamizono2016-06-163-6/+5
| * | Avoid type casting in uniqueness validatorRyuta Kamizono2016-06-041-5/+2
* | | Merge pull request #25407 from pjscopeland/doc/correct-pg-exampleRafael França2016-06-151-2/+2
|\ \ \
| * | | Example had results the wrong way round [ci skip]Patrick Copeland2016-06-161-2/+2
|/ / /
* | | Merge pull request #25339 from prathamesh-sonpatki/reuse-validate-index-lengthRafael França2016-06-151-7/+7
|\ \ \
| * | | Reuse existing validate_index_length! methodPrathamesh Sonpatki2016-06-091-7/+7
* | | | Merge pull request #25402 from alexcameron89/masterRafael França2016-06-141-1/+1
|\ \ \ \
| * | | | Change AS::Callback to ActiveSupport::Callbacks in doc [ci skip]Alex Kitchens2016-06-141-1/+1
|/ / / /
* | | | Fix postgresql query_cache testArthur Neves2016-06-141-0/+1
* | | | Respect the current `connected?` method when calling `cache`Arthur Neves2016-06-142-2/+17
* | | | Remove not needed line on testArthur Neves2016-06-141-1/+0
* | | | Merge pull request #25401 from jwgoh/docs/request-responseRichard Schneeman2016-06-141-2/+2
|\ \ \ \
| * | | | Add Rack doc link for request and response object [ci skip]Jun Wan Goh2016-06-141-2/+2
|/ / / /
* | | | Merge pull request #25399 from wynksaiddestroy/fix-typo-and-simply-after-comm...Robin Dupret2016-06-141-2/+2
|\ \ \ \
| * | | | [skip ci] Fix typo and simplify after_commit examplewynksaiddestroy2016-06-141-2/+2
|/ / / /
* | | | Fix error message to talk about the scale not precision of the typeRafael Mendonça França2016-06-131-1/+1
* | | | Fix missing requires for object/blankRafael Mendonça França2016-06-132-1/+3
* | | | Merge pull request #25390 from gsamokovarov/abstact-unit-presence-requireRafael França2016-06-131-0/+1
|\ \ \ \
| * | | | Require "active_support/core_ext/object/blank" for railties abstract unitGenadi Samokovarov2016-06-131-0/+1
* | | | | Remove deprecated arguments in assert_nothing_raisedRafael Mendonça França2016-06-132-6/+5
* | | | | Merge pull request #24756 from gsamokovarov/always-inherit-from-application-r...Rafael Mendonça França2016-06-131-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into always-inherit-from-application-recordGenadi Samokovarov2016-05-30323-6690/+8063
| |\ \ \ \ \
| * | | | | | Always genererate models with ApplicationRecord parentGenadi Samokovarov2016-04-285-29/+21
* | | | | | | Merge pull request #25319 from morgoth/generate-application-record-firstRafael França2016-06-135-28/+20
|\ \ \ \ \ \ \
| * | | | | | | Generate application_record.rb file before model fileWojciech Wnętrzak2016-06-085-28/+20
* | | | | | | | Merge pull request #25374 from kamipo/fix_calculate_with_string_in_from_and_e...Sean Griffin2016-06-132-9/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix `calculate` with a string value in `from` and eager loadingRyuta Kamizono2016-06-132-9/+5
* | | | | | | | | Explicitly require `acts_like` in AVSean Griffin2016-06-131-0/+1
* | | | | | | | | Merge pull request #25372 from kamipo/remove_assert_date_from_dbSean Griffin2016-06-132-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unnecessary `assert_date_from_db`Ryuta Kamizono2016-06-122-5/+1
* | | | | | | | | | Add codeclimate and rubocop config filesSean Griffin2016-06-132-0/+54
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #25380 from gsamokovarov/drop-unused-blank-requireKasper Timm Hansen2016-06-131-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove an unused require in ActiveSupport::TestCaseGenadi Samokovarov2016-06-131-2/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25378 from nikhilthombare/patch-1प्रथमेश Sonpatki2016-06-121-11/+11
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Changed ActiveJob::Base to ApplicationJob in the Active Job guide [ci skip] Nikhil Thombare2016-06-131-11/+11
|/ / / / / / / /
* | | | | | | | Merge pull request #25362 from maclover7/jm-rm-ar-requireEileen M. Uchitelle2016-06-121-2/+0
|\ \ \ \ \ \ \ \