aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge pull request #21635 from sideshowcoder/ar_type_docs_fixArthur Nogueira Neves2015-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | ActiveRecord Attributes API code fixPhilipp Fehre2015-09-151-1/+1
* | | | | | | | | | | | | | | | | | Merge pull request #20908 from y-yagi/generate_application_job_inside_engineArthur Nogueira Neves2015-10-132-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | add application_job.rb to template of mountable engineyuuji.yaginuma2015-07-172-0/+9
* | | | | | | | | | | | | | | | | | | Merge pull request #21954 from xtian/patch-1Matthew Draper2015-10-141-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix formatting of ActiveRecord PostgreSQL guide.Christian Wesselhoeft2015-10-131-4/+6
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #19135 from yuki24/access-control-supportJeremy Daer2015-10-138-22/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add the ability of returning arbitrary headers to ActionDispatch::StaticYuki Nishijima2015-06-138-22/+106
* | | | | | | | | | | | | | | | | | | | Merge pull request #21952 from headius/only_one_module_for_deprecationMatthew Draper2015-10-141-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Only prepend a single module when defining deprecation wrappers.Charles Oliver Nutter2015-10-131-4/+4
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | `private def` breaks RDoc. Move meathod to preserve the docs.Yves Senn2015-10-131-6/+6
* | | | | | | | | | | | | | | | | | | docs, :nodoc: `FromClause`, `QueryAttribute` and `WhereClauseFactory`.Yves Senn2015-10-133-3/+3
* | | | | | | | | | | | | | | | | | | docs, add missing `:nodoc: for `Associations::Builder`. [ci skip]Yves Senn2015-10-137-9/+9
* | | | | | | | | | | | | | | | | | | nodoc `ActiveRecord::ForeignAssociation`. [ci skip]Yves Senn2015-10-131-1/+1
* | | | | | | | | | | | | | | | | | | document `EagerLoadPolymorphicError`. [ci skip]Yves Senn2015-10-131-2/+4
* | | | | | | | | | | | | | | | | | | nodoc `ActiveRecord::Attribute::UserProvidedDefault`. [ci skip]Yves Senn2015-10-131-1/+1
* | | | | | | | | | | | | | | | | | | docs, recognize code examples as Ruby in `Relation::QueryMethods` [ci skip]Yves Senn2015-10-131-33/+37
* | | | | | | | | | | | | | | | | | | docs, nodoc internal Active Record `DelegateCache`. [ci skip]Yves Senn2015-10-131-3/+3
* | | | | | | | | | | | | | | | | | | docs, fix highlighting for code examples in calculations.rb [ci skip]Yves Senn2015-10-131-20/+20
* | | | | | | | | | | | | | | | | | | `:to_table` when adding a fk through `add_reference`.Yves Senn2015-10-134-3/+29
* | | | | | | | | | | | | | | | | | | Merge pull request #21938 from kamipo/move_schema_dumping_methods_into_approp...Yves Senn2015-10-135-92/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Move the methods for schema dumping into `{mysql,postgresql}/schema_dumper.rb`Ryuta Kamizono2015-10-135-92/+107
* | | | | | | | | | | | | | | | | | | Merge pull request #21288 from yahonda/mysql_requires_passwordArthur Nogueira Neves2015-10-122-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Allow mysql and mysql2 tests run by database user with passwordYasuo Honda2015-08-182-5/+5
* | | | | | | | | | | | | | | | | | | | Merge pull request #17388 from akampjes/masterArthur Nogueira Neves2015-10-124-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | ActionMailer https on URL with force_ssl = trueAndrew Kampjes2015-08-144-0/+23
* | | | | | | | | | | | | | | | | | | | Merge pull request #21931 from paul/bugfix/remove-deprecated-pg_dump-flagYves Senn2015-10-123-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Remove deprecated pg_dump -i flagPaul Sadauskas2015-10-101-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge pull request #21933 from kamipo/move_schema_definiton_classes_into_appr...Yves Senn2015-10-123-115/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Move schema creation class into `mysql/schema_creation.rb`Ryuta Kamizono2015-10-112-53/+59
| * | | | | | | | | | | | | | | | | | | | | Move schema definition classes into `mysql/schema_definitions.rb`Ryuta Kamizono2015-10-112-62/+70
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #21849 from yui-knk/refactor_regexp_to_stringAndrew White2015-10-124-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Change `Journey::Route#verb` to return string instead of regexp.yui-knk2015-10-034-7/+14
* | | | | | | | | | | | | | | | | | | | | | edit pass over the project Gemfile [ci skip]Xavier Noria2015-10-121-18/+17
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #21936 from y-yagi/do_not_generate_manifest_in_pluginsJeremy Daer2015-10-112-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | do not generate manifest.js in pluginsyuuji.yaginuma2015-10-122-1/+2
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #21934 from etdev/docs/deep-dup-typoClaudio B.2015-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | [ci skip] Fix typo in deep_dup docsEric Turner2015-10-121-1/+1
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #11410 from bogdan/increment-concurencyJeremy Daer2015-10-105-40/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Make #increment! and #decrement! methods concurency safeBogdan Gusiev2015-10-055-40/+41
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #20940 from rafaelsales/allow-multiple-root-routesRafael Mendonça França2015-10-102-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Allow multiple `root` routes in same scope levelRafael Sales2015-10-102-2/+11
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #21631 from RobinClowers/fix-cache-instrumentationJeremy Daer2015-10-093-13/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix Cache#fetch instrumentationRobin Clowers2015-09-141-13/+11
| * | | | | | | | | | | | | | | | | | | | | | Add test cases for Cache#fetch instrumentationRobin Clowers2015-09-141-0/+28
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #21927 from ronakjangir47/remove_is_a_specRafael Mendonça França2015-10-092-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | used predicate methods to avoid is_a? checksRonak Jangir2015-10-102-3/+5
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #21928 from Gaurav2728/update_ruby_oracle_gemRafael Mendonça França2015-10-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | update to ruby-oci8 - 2.2.0Gaurav Sharma2015-10-101-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #21878 from Gaurav2728/require_monitorMatthew Draper2015-10-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |