Conversation
…:Timestamps. Not required anymore since DM fixed this bug.
* This is necessary because dm automatically defines appropriate FK properties for m:1 and 1:1 relationships, if the respective FK property wasn't explicitly defined by the programmer.
* Because DataMapperSession was always required, the sessions table would always be created during an auto_migrate!. The check to see if DataMapperSession should be required was using the wrong configuration. Also, due to the ordering of storage_names[default_repository_name] and the definition of self.default_repository_name, the configured default_repository_name was never used. These have been fixed.
This fixes an issue where before/after filters wouldn't make use of the identity map because previously only Merb::Controller#_call_action was wrapp
Also fixed a previously failing spec for select helpers
Thin and Phusion Passenger for example. [#1255 state:resolved]
Previously :crypted_password was set with :length => 60 This commit reestablishes this setting which was previously deleted in a first attempt to be compliant with dm-0.10.0
The generator in merb_datamapper respects this too.
All merb-core specs pass again.
params[:tempfile] is of kind Tempfile and not File
(as was specced previously).
The only reason this broken spec passed earlier,
was due to a bug in rspec <= 1.2.3 that allowed
Tempfile.new('random').should be_a_kind_of(File)
In rspec > 1.2.4 running the same will throw an error.
rake spec in the toplevel merb directory now passes all specs. Also, merb-core/rake specs:oneoh passes
This is a temporary fix for 1.0.x. In merb-1.1 this will be handled by active_model compliance, thus only #new_record? will be used from 1.1 onwards.
Allow generated apps to still function even when Webrat isn't installed. Otherwise it will show an undefined Constant Merb::Test::ViewHelper, and you have to track it down to the source to see that this is because Webrat isn't available.
[#1282 state:resolved]
Without this change, the default password strategy is always activated because the wrong config key is used. [#1179 state:resolved]
[#895 state:resolved]
Require sass instead of sass/plugin (via Tony Mann)
[#1298 state: resolved ] This patch fixes a potential timing attack on the HMAC authentication used to verify cookie session contents by ensuring a constant time algorithm is used to compare the hashes. For more information see: http://codahale.com/a-lesson-in-timing-attacks/
Setting thor dependency to use 0.9.x branch, as newer versions will break the default merb-gen app bundling tasks [#1306 state:resolved]
Because of how BootLoader loads dependencies one can't use dependency in the init.rb unless dependency "xy", :immediate => true is used. That's because Kernel.dependency() postpone loading of the gems to the later bootloader and loads the init.rb first to find out what dependencies to load. [#1289 state:resolved]
This change allows you to have default adapter set in the init.rb and still if you want to run Merb in IRB you can do it. Currently you can't because setting adapter in init.rb override the config value from ARGV parsing. [#1262 state:resolved]
This also works around an issue where rspec-1.2.9 seems to write all spec files to the spec/spec.opts file in case the spec.opts file is empty.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.