aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* fix 2.1.0 bug :(schneems2013-12-251-1/+1
|
* ensure environment is run before db:structure:loadschneems2013-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now `db:drop` depends on `load_config` since so when `db:drop` gets executed `load_config` gets run. `db:structure:load` depends on `[:environment, :load_config]`. So before it runs, it executes `environment` but because `load_config` has already executed it is skipped. Note `db:load_config` is "invoke"-d twice, but only "execute"-d once: ``` ** Invoke db:drop (first_time) ** Invoke db:load_config (first_time) ** Execute db:load_config ** Execute db:drop ** Invoke db:structure:load (first_time) ** Invoke environment (first_time) ** Execute environment ** Invoke db:load_config ** Execute db:structure:load ``` The fix for this is making sure that the environment is run before any `load_config`: ``` ** Invoke environment (first_time) ** Execute environment ** Invoke db:drop (first_time) ** Invoke db:load_config (first_time) ** Execute db:load_config ** Execute db:drop ** Invoke db:structure:load (first_time) ** Invoke environment ** Invoke db:load_config ** Execute db:structure:load ```
* Partial fix of database url testsschneems2013-12-251-1/+4
| | | | | | | | Prior to #13463 when `DATABASE_URL` was set, Rails automagically used that value instead of the database.yml. There are tests in dbs_test that expect this to still be true. After that PR, `RAILS_DATABASE_URL` is expected to be read into the YAML file via ERB, this PR fixes that behavior. Note: this does not entirely fix the tests. It seems that `ActiveRecord::Tasks::DatabaseTasks.current_config` does not process the url string correctly (convert it into a hash), and ` ActiveRecord::Tasks::DatabaseTasks.structure_load(current_config, filename)` as well as other methods in `DatabaseTasks` expect a hash. It seems like we should involve the resolver somewhere in this process to correctly convert the database url, I do not know the best place for that /cc @josevalim
* Fix tests names: tokens.yml => secrets.ymlGuillermo Iguaran2013-12-251-2/+2
|
* using symbol instead of string in establish_connectionKuldeep Aggarwal2013-12-251-1/+1
|
* Revert "Ensure secret_key_base is set for all environments"José Valim2013-12-241-2/+1
| | | | | | A better solution has been pushed to master. This reverts commit 959cfcef7255bba720ce3f15323056533ea7b50a.
* Merge pull request #13472 from schneems/schneems/fix-master-database-url-testsJosé Valim2013-12-241-1/+2
|\ | | | | Fix railties tests in master
| * Fix railties tests in masterschneems2013-12-241-1/+2
| | | | | | | | | | Tests are failing due to missing env var on master https://travis-ci.org/rails/rails/jobs/15930622#L641 This adds an environment variable `ENV['RAILS_SECRET_KEY_BASE']` so these tests will pass.
* | Merge pull request #13471 from schneems/schneems/better-secrets-error-messageJosé Valim2013-12-241-1/+1
|\ \ | |/ |/| Better missing `secret_key_base` error message
| * Better missing `secret_key_base` error messageschneems2013-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the error was: ``` RuntimeError: You must set secret_key_base in your app's config ``` Will now be: ``` RuntimeError: Missing `secret_key_base` for 'production' environment, set this value in `config/secrets.yml` ```
* | Ensure secret_key_base is set for all environmentsJosé Valim2013-12-241-1/+2
| |
* | Only build a ConnectionSpecification if requiredJosé Valim2013-12-241-1/+1
| |
* | Fix build failures related to the new ENV options in ymlJosé Valim2013-12-241-0/+18
| |
* | Update CHANGELOG [ci skip]José Valim2013-12-231-0/+5
| |
* | Use the new Resolver API in dbconsoleJosé Valim2013-12-231-3/+2
| |
* | Add examples and namespace ENV options with "RAILS_"José Valim2013-12-2312-13/+25
| |
* | Do not store production information in .yml filesJosé Valim2013-12-2312-40/+36
|/ | | | Instead, read information from environment variables.
* Add comments with urls for email previewsAndrew White2013-12-222-6/+13
|
* Use Full path to sqlite database in testsschneems2013-12-222-4/+4
|
* Fix DB Console tests schneems2013-12-211-20/+22
| | | | | | | | | | | The build is broken: https://travis-ci.org/rails/rails/builds/15824530 This commit fixes it. The problem: Sqlite expects the `database` part to be an absolute path. That prompted this change to be committed to master: https://github.com/rails/rails/commit/fbb79b517f3127ba620fedd01849f9628b78d6ce This change provides correct behavior. Unfortunately tests were introduced in https://github.com/rails/rails/commit/971d5107cd4cd08c22a85d34546f4ba03ed5c925 that were relying on the incorrect behavior. We can avoid the fix by changing to another database url such as `mysql` or `postgresql` In addition to fixing the failure, the assertions are changed so that the "expected" value comes before "actual" value.
* Add a changelog entry for #13326 [ci skip]Robin Dupret2013-12-211-0/+8
|
* `html` and `text` templates for mailers by defaultKassio Borges2013-12-207-8/+39
|
* Bump Jbuilder version to 2.0.0Pavel Pravosud2013-12-201-1/+1
|
* Merge pull request #13415 from schneems/schneems/database-no-usernameYves Senn2013-12-192-4/+18
|\ | | | | Do not expect database user with app name to exist
| * Do not expect database user with app name to existschneems2013-12-192-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default when creating a project with `--database=postgresql` the `config/database.yml` file that is generated has a user specified that is the same as the app name ``` development: adapter: postgresql encoding: unicode database: <%= app_name %>_development pool: 5 username: <%= app_name %> password: ``` This is counterintuitive and would rarely be valid. By default postgres creates a user with the current user name (http://www.postgresql.org/docs/9.3/static/database-roles.html) "it will have the same name as the operating system user that initialized the database cluster": ``` $ whoami schneems ``` If the `username` is left out postgresql will assume that you wish to log in as the default user ``` $ psql -c '\du' List of roles Role name | Attributes | Member of -----------+------------------------------------------------+----------- schneems | Superuser, Create role, Create DB, Replication | {} ``` A good sensible default then for auto generated `database.yml` files is to remove the `username`, and have postgres attempt to connect to the database as the currently logged in user. Instead of submitting with a blank password, don't submit a password.
* | Use sass-rails 4.0.1Takayuki Matsubara2013-12-201-1/+1
| |
* | Merge pull request #13326 from schneems/schneems/add-asset-flagGuillermo Iguaran2013-12-191-0/+5
|\ \ | | | | | | Flag `config.assets.raise_runtime_errors` in dev
| * | Flag `config.assets.raise_runtime_errors` in devschneems2013-12-191-0/+5
| | | | | | | | | | | | | | | By default `config.assets.raise_runtime_errors` should be set to `true` in development for new apps. Source: https://github.com/rails/sprockets-rails/pull/100
* | | Make `rails runner` command options more obviousschneems2013-12-191-5/+14
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're surrounding the options in angle brackets `<>` as is convention in `curl`: ``` $ curl --help Usage: curl [options...] <url> ``` And then in square brackets `[]` with bars `|` as in `tar`: ``` $ tar --help ... Create: tar -c [options] [<file> | <dir> | @<archive> | -C <dir> ] ``` To further clarify that the command can be used with both, we now show examples: ``` Examples: rails runner 'puts Rails.env' This runs the code `puts Rails.env` after loading the app rails runner path/to/filename.rb This runs the Ruby file located at `path/to/filename.rb` after loading the app ``` This format was taken from the `find` man pages: ``` EXAMPLES The following examples are shown as given to the shell: find / \! -name "*.c" -print Print out a list of all the files whose names do not end in .c. find / -newer ttt -user wnj -print Print out a list of all the files owned by user ``wnj'' that are newer than the file ttt. ``` The the text at the bottom is also shifted to improve readability.
* | Make possible to use symbol as the verifier nameRafael Mendonça França2013-12-193-10/+10
| |
* | Change the message verifier argument to verifier_nameRafael Mendonça França2013-12-192-8/+8
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-201-1/+1
|\ \
| * | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-031-1/+1
| | |
* | | Merge pull request #13366 from vipulnsward/minitest-namespace-changeGodfrey Chan2013-12-182-3/+3
|\ \ \ | | | | | | | | Change all `MiniTest` to `Minitest`
| * | | Change all `MiniTest` to `Minitest` since, `MiniTest` namespace has been ↵Vipul A M2013-12-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | renamed to `Minitest` Ref: https://github.com/seattlerb/minitest/blob/master/History.txt
* | | | make clear that config/secrets.yml passes through ERB and therefore supports ENVXavier Noria2013-12-181-0/+6
|/ / /
* | | Its beta1 all aroundDavid Heinemeier Hansson2013-12-171-1/+1
| | |
* | | Remove the navigator for now. Its ugly and it promises more than it can ↵David Heinemeier Hansson2013-12-171-6/+1
| | | | | | | | | | | | deliver. These other views (properties, routes) are not designed to be loaded in isolation
* | | Add changelog entries about secrets.yml and secrets.secret_key_baseGuillermo Iguaran2013-12-171-0/+29
| | |
* | | Default I18n.enforce_available_locales to trueCarlos Antonio da Silva2013-12-171-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will default this option to true from now on to ensure users properly handle their list of available locales whenever necessary. This option was added as a security measure and thus Rails will follow it defaulting to secure option. Also improve the handling of I18n config options in its railtie, taking the new enforce_available_locales option into account, by setting it as the last one in the process. This ensures no other configuration will trigger a deprecation warning due to that setting.
* | | Add mailer previews feature based on mail_view gemAndrew White2013-12-1711-5/+634
| | |
* | | Add an application controller for internal controllersAndrew White2013-12-173-18/+23
| | |
* | | Fix method redefinition warningAndrew White2013-12-171-2/+6
| | |
* | | Merge pull request #13328 from teohm/dbconsole_support_database_urlYves Senn2013-12-163-35/+76
|\ \ \ | | | | | | | | Fixed rails dbconsole to support DATABASE_URL
| * | | fixed rails dbconsole to support ENV['DATABASE_URL'].Huiming Teo2013-12-163-35/+76
| | |/ | |/|
* / | Regression test for load_structure and clone_structureArthur Neves2013-12-141-2/+4
|/ /
* | Merge pull request #13298 from rails/secret_tokensGuillermo Iguaran2013-12-138-15/+79
|\ \ | | | | | | Create config/secrets.yml file for store of tokens
| * | Add comment about secret_key_base in secrets.ymlGuillermo Iguaran2013-12-131-0/+12
| | |
| * | Rename tokens.yml to secrets.ymlGuillermo Iguaran2013-12-125-6/+6
| | |
| * | Add test for custom tokens stored in config/tokens.ymlGuillermo Iguaran2013-12-121-0/+13
| | |