Skip to content

Generating /lib/assets for assets #1481

Merged
merged 1 commit into from Jun 27, 2011

3 participants

@arunagw
Ruby on Rails member
arunagw commented Jun 4, 2011

/cc @dhh

@josevalim
Ruby on Rails member

@dhh are you ok with this?

@dhh
Ruby on Rails member
dhh commented Jun 16, 2011

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

@arunagw
Ruby on Rails member
arunagw commented Jun 16, 2011

@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.

@arunagw
Ruby on Rails member
arunagw commented Jun 16, 2011

Commits updated.

@arunagw arunagw commented on the diff Jun 17, 2011
railties/test/generators/app_generator_test.rb
log
- app/assets/images
@arunagw
Ruby on Rails member
arunagw added a note Jun 17, 2011

Moved Up with app/assets block.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@arunagw
Ruby on Rails member
arunagw commented Jun 20, 2011

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

@dhh dhh merged commit 449cc3e into rails:master Jun 27, 2011
@chriseppstein chriseppstein added a commit to chriseppstein/rails that referenced this pull request Jun 27, 2011
@chriseppstein 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
@ttosch ttosch pushed a commit that referenced this pull request Jan 19, 2015
@chriseppstein 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
db913b8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.