aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #30094 from dixpac/change_azure_name_in_storage_ymlDavid Heinemeier Hansson2017-08-061-3/+3
|\ | | | | Fix wrong service name in the storage.yml
| * Fix wrong service name in the storage.ymldixpac2017-08-061-3/+3
| |
* | Merge pull request #30099 from ↵David Heinemeier Hansson2017-08-061-1/+1
|\ \ | | | | | | | | | | | | bogdanvlviv/set_version_of_active_storage_to_5_2_0_alpha_inside_package_json Active Storage to 5.2.0.alpha inside `activestorage/package.json`
| * | Active Storage to 5.2.0.alpha inside `activestorage/package.json`bogdanvlviv2017-08-061-1/+1
| |/ | | | | | | Follow #30083
* | Merge pull request #30097 from mgiagante/masterRyuta Kamizono2017-08-071-1/+1
|\ \ | |/ |/| Replaces the 17 for the actual call to params[:id] that would make th…
| * Replaces the 17 for the actual call to params[:id] that would make the code ↵Mariano Giagante2017-08-061-1/+1
|/ | | | work as intended. [ci skip]
* Pass over Active Storage readme [ci skip] (#30086)Vipul A M2017-08-061-2/+2
|
* Merge pull request #30089 from yboulkaid/masterRyuta Kamizono2017-08-061-4/+0
|\ | | | | Remove outdated comment [ci skip]
| * Remove outdated comment [ci skip]Youssef Boulkaid2017-08-061-4/+0
|/ | | | | The comment was describing a previous version of the method with a different signature. This is outdated since e76c38e
* Merge pull request #30066 from claudiob/ast-moduleDavid Heinemeier Hansson2017-08-0512-665/+690
|\ | | | | `module ActiveStorage`, not `ActiveStorage::Class`
| * Merge branch 'master' into ast-moduleDavid Heinemeier Hansson2017-08-0515-28/+33
| |\ | |/ |/|
* | Merge pull request #30068 from kamipo/user_start_with_than_regexpDavid Heinemeier Hansson2017-08-051-4/+4
|\ \ | | | | | | Use `content_type.start_with?("...")` than `content_type =~ /^.../`
| * | Use `content_type.start_with?("...")` than `content_type =~ /^.../`Ryuta Kamizono2017-08-051-4/+4
| | | | | | | | | | | | | | | `start_with?` is a little faster than regexp for prefix matching by a fixed string.
* | | Merge pull request #30081 from y-yagi/fix_ruby_warningsDavid Heinemeier Hansson2017-08-056-11/+17
|\ \ \ | | | | | | | | Fix ruby warnings
| * | | Fix ruby warningsyuuji.yaginuma2017-08-056-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes following warnings: ``` test/models/variant_test.rb:11: warning: ambiguous first argument; put parentheses or a space even after `/' operator lib/active_storage/attached/macros.rb:63: warning: instance variable @active_storage_attached_highlights not initialized lib/active_storage/attached/macros.rb:25: warning: instance variable @active_storage_attached_avatar not initialized ```
* | | | Merge pull request #30080 from georgeclaghorn/active-storage-secret-key-baseDavid Heinemeier Hansson2017-08-052-4/+2
|\ \ \ \ | | | | | | | | | | Active Storage: check for `app.secrets.secret_key_base`, not `app.config.secret_key_base`
| * | | | Check for `app.secrets.secret_key_base`, not `app.config.secret_key_base`George Claghorn2017-08-052-4/+2
| |/ / / | | | | | | | | | | | | By default, apps only have the former set.
* | | | Merge pull request #30082 from kamipo/add_missing_blank_lineDavid Heinemeier Hansson2017-08-051-0/+1
|\ \ \ \ | | | | | | | | | | Add missing blank line between `config.active_storage` and `config.action_cable`
| * | | | Add missing blank line between `config.active_storage` and `config.action_cable`Ryuta Kamizono2017-08-051-0/+1
| |/ / /
* | | | Merge pull request #30083 from ↵David Heinemeier Hansson2017-08-051-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | koic/change_gem_version_of_active_storage_to_5_2_0 Change gem version of Active Storage to 5.2.0.alpha
| * | | | Change gem version of Active Storage to 5.2.0.alphaKoichi ITO2017-08-051-2/+2
| |/ / /
* | | | Merge pull request #30056 from dixpac/remove_unecessary_variableDavid Heinemeier Hansson2017-08-051-1/+1
|\ \ \ \ | | | | | | | | | | Remove unnecessary variable
| * | | | Remove unecesarry exception variabledixpac2017-08-051-1/+1
|/ / / /
* / / / Revert "Merge pull request #15446 from akshay-vishnoi/doc_changes"Matthew Draper2017-08-051-1/+1
|/ / / | | | | | | | | | It was right as originally written in #15440.
* | | Merge pull request #30078 from y-yagi/fix_respositoryRyuta Kamizono2017-08-052-4/+4
|\ \ \ | |/ / |/| | Fix repository URL [ci skip]
| * | Fix repository URL [ci skip]yuuji.yaginuma2017-08-052-4/+4
|/ / | | | | | | changed `rails/activestorage` to `rails/rails`.
| * `module ActiveStorage`, not `ActiveStorage::Class`claudiob2017-08-0412-660/+685
|/ | | | | | | | | | | | | | | | | | The reasons for this commit are: - uniformity with the other Rails libraries - (possibly) behave better with respect to autoloading - fix the index in the generated documentation Before this commit, run `rake rdoc` generates this left sidebar (ActiveStorage entries are indexed twice, both inside and outside the module): <img width="308" alt="before" src="https://user-images.githubusercontent.com/10076/28939523-7c087dec-7846-11e7-9289-38ed4a2930cd.png"> After this commit, run `rake rdoc` generates this left sidebar: (ActiveStorage entries are only indexed inside the module): <img width="303" alt="after" src="https://user-images.githubusercontent.com/10076/28939524-7c090be0-7846-11e7-8ee5-29dfecae548e.png">
* Merge pull request #30020 from rails/active-storage-importDavid Heinemeier Hansson2017-08-04144-26/+7217
|\ | | | | Add Active Storage to Rails
| * Rename Azure to AzureStorage (#30057)Dino Maric2017-08-046-8/+8
| |
| * Fix tests for AWS buckets that include a . (#30059)Claudio B2017-08-042-3/+7
| | | | | | | | | | | | | | | | | | If an AWS bucket name includes a `.` (e.g. `bucket.name`), then the canonical URL for an object will start with "https://s3.amazonaws.com/bucket.name/" and not with "https://bucket.name.s3.amazonaws.com/". The URL tests have now been separated into two separate asserts, to ensure that both the "s3.amazonaws.com" and the "bucket.name" components are included, but not specifically in that order.
| * Add Active Storage to README and release (#30065)Claudio B2017-08-042-1/+3
| | | | | | Before we forget...
| * Make sure the test fails if the code chagesRafael Mendonça França2017-08-041-8/+10
| | | | | | | | | | | | | | | | The test was passing before because it was not being testes correctly. Now we create a different engine that is loaded before the already exising and we make sure that the first call for isolate_namespace is what takes effect.
| * Do not call isolate_namespace on the applicationRafael Mendonça França2017-08-041-1/+9
| | | | | | | | | | | | | | | | | | What we want to test is that two different calls to isolate_namespace with the same module doesn't change the original railtie. We can do that defining two different railties. We can't call in the application because this method is not supposed to be called in an Application class.
| * Include active_storage in all generated application.rb filesDavid Heinemeier Hansson2017-08-043-1/+4
| | | | | | | | And deal with a temporary test fix until we allow you to skip active storage.
| * Convert to strings so array can be sorted deterministicallyDavid Heinemeier Hansson2017-08-041-3/+3
| |
| * Deterministic comparisons pleaseDavid Heinemeier Hansson2017-08-031-3/+3
| |
| * Do not change the entire codebase style only because of active_storageRafael Mendonça França2017-08-032-5/+2
| | | | | | | | | | | | We are already removing the braces around hash parameters in the last argument in other places so we should not change the entire codebase because of two places.
| * Merge pull request #30041 from dixpac/change_azure_core_dependecyRafael França2017-08-032-13/+4
| |\ | | | | | | Change azure core dependency
| | * Depend on offical azure-coredixpac2017-08-032-13/+4
| | | | | | | | | | | | | | | No need to depend on my fork anymore, they've just release fix officially.
| * | Fix all rubocop violationsRafael Mendonça França2017-08-032-6/+5
| | |
| * | Merge pull request #30061 from claudiob/ast-rubocopRafael França2017-08-035-5/+5
| |\ \ | | | | | | | | Make Rubocop happy about ActiveStorage
| | * | Make Rubocop happier about ActiveStorageclaudiob2017-08-035-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `rubocop activestorage` before this commit resulted in 20 offenses. This commit only fixes: - Trailing whitespace detected - Space inside } missing - Put one space between the method name and the first argument. The other offenses are left since they are intentional according to @georgeclaghorn (https://github.com/rails/rails/pull/30061#issuecomment-319999190)
| * | | We need to require the top file before individual oneRafael Mendonça França2017-08-031-0/+1
| | | |
| * | | Do not eager load ActiveRecord::BaseRafael Mendonça França2017-08-036-22/+6
| | | | | | | | | | | | | | | | Everything inside the app directory of a engine is autoload/eager loaded automatically so we don't need to require them.
| * | | Merge branch 'active-storage-import' of github.com:rails/rails into ↵David Heinemeier Hansson2017-08-035-7/+85
| |\ \ \ | | | | | | | | | | | | | | | active-storage-import
| | * | | Remove duplicated convert_direct_upload_option_to_urlRafael Mendonça França2017-08-032-7/+4
| | | | | | | | | | | | | | | | | | | | FormHelper includes FormTagHelper so we don't need to define two methods
| | * | | Refactor convert_direct_upload_option_to_urlRafael Mendonça França2017-08-032-3/+35
| | | | | | | | | | | | | | | | | | | | Also make sure file_field doesn't mutate the original options passed in.
| | * | | Make sure Action View doesn't break with Active StorageRafael Mendonça França2017-08-033-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | When Active Storage is not loaded and direct_upload is used on file_field_tag we should not raise an exception.
| * | | | Active Storage routes are now part of the default routesDavid Heinemeier Hansson2017-08-031-9/+37
| |/ / / | | | | | | | | | | | | It's worth considering whether we should hide these by default, but I'm kinda thinking no. It's very reasonable that someone would want to call these directly, so they should be documented.
| * | | Same issue from AR getting loaded earlierDavid Heinemeier Hansson2017-08-031-3/+3
| | | | | | | | | | | | | | | | cc @rafaelfranca