| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
|
|
|
|
|
|
|
|
|
| |
This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d.
Conflicts:
railties/lib/rails/generators/app_base.rb
Reason: sprockets 2.9.1 fixes this issue
|
|
|
|
|
|
|
| |
applications
This gem will not change often to explain it be included in the
application Gemfile
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Following up on an observation by @rafaelfranca
https://github.com/rails/rails/pull/10170/files#r3753963
Reduce the number of gsub calls to the two cases where inputs are concatenated
from various sources and with inconsistent indentation.
Also zap extraneous spacing from the sass-rails line... presumably this is a
holdover from a previous time where this aligned the version string with an
adjacent line.
|
|
|
|
|
|
| |
* When run with default options, no repeated blank lines
* Every gem has a comment, perhaps a generic one, but a comment nonetheless
* Most comments used to start with "Use", some with "To use" => made consistent
|
|
|
|
|
|
| |
See https://travis-ci.org/rails/rails/jobs/6110543#L1285 for the failure
cc @josh
|
|
|
|
|
|
|
| |
This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8.
Conflicts:
railties/lib/rails/generators/app_base.rb
|
|
|
|
| |
Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc
|
|
|
|
| |
Introduced in 59d20af2238f7ab553f41b96282722889d8d4393.
|
| |
|
|
|
|
| |
provided
|
|
|
|
| |
based on a discussion with @rafaelfranca
|
|
|
|
|
|
| |
- Remove obsolete/misleading comment about assets only being used production
- Remove unnecessary group :assets
- Eliminate blank lines if options[:skip_javascript] is not specified
|
|
|
|
| |
v3 of pull request based on additional feedback from @jeremy
|
|
|
|
| |
completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980
|
| |
|
| |
|
| |
|
|\
| |
| | |
Remove `--builder` option from `rails` command
|
| |
| |
| |
| |
| |
| |
| | |
Ability to use a custom builder by passing `--builder` (or `-b`) has
been removed. Consider using application template instead. See this
guide for more detail:
http://guides.rubyonrails.org/rails_application_templates.html
|
|/ |
|
|
|
|
| |
Use 'some' instead of 'a/an'.
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
This reverts commit f34c27a452418d8aa17f92bb0fd7ae97b5f7e252.
We'll be taking a different tack on this with new `bundle binstubs <gem>` support.
|
|
|
|
|
| |
This reverts commit 7173c4f931c9026bd3bc0b644d93dae744433f09.
This reverts commit a562f9fa09967eba26dff1c3bc8aa85b6f0a72ff.
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Move the Journey code underneath the ActionDispatch namespace so
that we don't pollute the global namespace with names that may
be used for models.
Fixes rails/journey#49.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is an alternative implementation to #7771 thanks to the advice of @spastorino
Rails is a dynamic framework that serves a static index.html by default. One of my first questions ever on IRC was solved by simply deleting my public/index.html file. This file is a source of confusion when starting as it over-rides any set "root" in the routes yet it itself is not listed in the routes. By making the page dynamic by default we can eliminate this confusion.
This PR moves the static index page to an internal controller/route/view similar to `rails/info`. When someone starts a rails server, if no root is defined, this route will take over and the "dynamic" index page from rails/welcome_controller will be rendered. These routes are only added in development. If a developer defines a root in their routes, it automatically takes precedence over this route and will be rendered, with no deleting of files required.
In addition to removing this source of confusion for new devs, we can now use Rails view helpers to build and render this page. While not the primary intent, the added value of "dogfooding" should not be under-estimated.
The prior PR #7771 had push-back since it introduced developer facing files. This PR solves all of the same problems, but does not have any new developer facing files (it actually removes one).
cc/ @wsouto, @dickeyxxx, @tyre, @ryanb, @josevalim, @maxim, @subdigital, @steveklabnik
ATP Railties and Actionpack.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
activerecord/lib/active_record/persistence.rb
railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Users of other SCM's can now generate rails
apps that will add the "empty" directories to source control,
but will not have a useless .gitignore or mis-named .gitkeep
files.
* Change `rails new` and `rails plugin new` generators to name
the `.gitkeep` as `.keep` in a more SCM-agnostic way.
* Change `--skip-git` option to only skip the `.gitignore` file
and still generate the `.keep` files.
* Add `--skip-keeps` option to skip the `.keep` files.
It closes #2800.
|
|
|
|
|
|
|
| |
The app generator is not generally run under bundler, but the Bundler
constant is used here.
In particular you cannot create --dev apps without this.
|
| |
|
|
|
|
|
|
|
|
| |
The cause of the previous revert was bug in bundler that made it hard to
make railties test work. Fix for bundler was recently pushed to github,
so now we can safely get back to the original commit.
This reverts commit 0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.
|
| |
|
|
|
|
|
|
| |
'therubyracer'.
Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
|
|
|
|
|
|
|
|
|
|
|
| |
Reverted changes:
f3482a9 Fix tests in railties
5904295 improve #6318
aed906a prevent using already loaded Gemfile for 'bundle install'
In order to fix this, we need a fix in bundler related to GEM_PATH,
which will allow to run tests properly. I will get this changes back
when it happens.
|
| |
|
| |
|