Skip to content
This repository

Generating /lib/assets for assets #1481

Merged
merged 1 commit into from about 3 years ago

3 participants

Arun Agrawal José Valim David Heinemeier Hansson
Arun Agrawal
Collaborator

/cc @dhh

José Valim
Owner

@dhh are you ok with this?

David Heinemeier Hansson
Owner
dhh commented

Let's just add lib/assets. People can fill that in with whatever subdirectories they need. Also, don't delete app/assets/images please.

Arun Agrawal
Collaborator

@dhh I will just add lib/assets only. I have just moved up actually " app/assets/images" in test.

I will update the commits now.

Arun Agrawal
Collaborator

Commits updated.

Arun Agrawal arunagw commented on the diff
railties/test/generators/app_generator_test.rb
((5 lines not shown))
25 27 log
26   - app/assets/images
1
Arun Agrawal Collaborator
arunagw added a note

Moved Up with app/assets block.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Arun Agrawal
Collaborator

@dhh i have squashed the commits into one commit. We are only generating lib/assets folder now.

David Heinemeier Hansson dhh merged commit 449cc3e into from
David Heinemeier Hansson dhh closed this
Chris Eppstein chriseppstein referenced this pull request from a commit in chriseppstein/rails
Chris Eppstein chriseppstein Merge remote-tracking branch 'rails/3-1-stable' into asset_urls
* rails/3-1-stable: (49 commits)
  Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby)
  Merge pull request #1481 from arunagw/lib_assets
  Improve ordering of multiple columns on postgresql
  judgement -> judgment, according to guidelines
  Follow rails convention by using Array.wrap
  Allow to specify mass-assignment roles as array
  Apply the default scope earlier when doing calculations. Fixes #1682.
  updated rspec link
  grammar changes in named routes description and clarity around possibilities for options
  font style changes in perf guide
  grammar changes to log subscriber docs
  move example code to be above reconfiguring discussion; add clarity about silencers and filters; misc grammar changes - for backtrace cleaners
  Fixed typo
  use present tense on examples
  more detail on how the flow between redirect and show works, and minor grammar
  remove extra space and clarify how an exception is made for controller wide layouts
  reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made
  singularize module and be explicit about what is delivered
  grammar (missing "a") and formatting
  elaborate details on why to use _url instead of _path in mailers
  ...

Conflicts:
	actionpack/lib/action_view/helpers/asset_paths.rb
	actionpack/lib/sprockets/helpers/rails_helper.rb
4b8bd7a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
1  railties/lib/rails/generators/rails/app/app_generator.rb
@@ -88,6 +88,7 @@ def doc
88 88 def lib
89 89 empty_directory "lib"
90 90 empty_directory_with_gitkeep "lib/tasks"
  91 + empty_directory_with_gitkeep "lib/assets"
91 92 end
92 93
93 94 def log
3  railties/test/generators/app_generator_test.rb
@@ -10,6 +10,7 @@
10 10 config.ru
11 11 app/assets/javascripts
12 12 app/assets/stylesheets
  13 + app/assets/images
13 14 app/controllers
14 15 app/helpers
15 16 app/mailers
@@ -22,8 +23,8 @@
22 23 doc
23 24 lib
24 25 lib/tasks
  26 + lib/assets
25 27 log
26   - app/assets/images
27 28 script/rails
28 29 test/fixtures
29 30 test/functional

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.