Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

ruby 1.9.3-p327 rails 3.2.9 newest haml, factory_girl rspec etc. #291

Closed
wants to merge 13 commits into from

2 participants

@darkbart

works on my heroku

http://whispering-shelf-9842.herokuapp.com/

Everyone can switch to ruby-1.9.3-p327

FactoryGirl have new notation

I cannot move forward without this changes. sorry for ugly helper method ... will be removed ASAP but now we have different priorities

rake db:setup`

on development works fine heroku still need some fix it try to index files added on the fly by seeding process :/

My master branch keep this changes without them I have zero productivity

happy coding for all with new "engine" ;)

@darkbart darkbart closed this
@darkbart darkbart reopened this
@naleksi
Owner

Hi! Rails already upgraded to 3.2.11 (avoinministerio@57f8781).

Could you give some comments on changes of config. due the Rails upgrade? Wy no mass_assignment_sanitizer in production?

And the Secret token most definitely should be in .gitignore and not committed ever.

pardon but all the stuff from env. is generated by rake rails:update and I keep all of them default / or if ministerio override it then ministerio version

remember that I am at work it's not ministerio time :) but i upgrade all the projects at work so yours too ;)

merge it as is then feel free to override defaults but please in new commits

Webmaster and others added some commits
Webmaster Merge branch 'bumping_engine'
Conflicts:
	Gemfile
	Gemfile.lock
	spec/spec_helper.rb
bca16f2
@darkbart darkbart Merge branch 'master' of github.com:avoinministerio/avoinministerio
Conflicts:
	Gemfile
	Gemfile.lock
cca0c58
@darkbart darkbart Merge branch 'master' of github.com:avoinministerio/avoinministerio
Conflicts:
	Gemfile
	Gemfile.lock
	spec/controllers/ideas_controller_spec.rb
	spec/controllers/pages_controller_spec.rb
	spec/models/idea_spec.rb
	spec/spec_helper.rb
1c098fb
@darkbart darkbart fixed spec_helper 5a8a8db
@darkbart darkbart Merge branch 'master' of github.com:avoinministerio/avoinministerio
Conflicts:
	config/environments/test.rb
85b0115
@darkbart darkbart Merge branch 'master' of github.com:avoinministerio/avoinministerio 6415d7a
@darkbart

outdated

@darkbart darkbart closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 3, 2012
  1. @darkbart
  2. @darkbart

    bumping gems

    darkbart authored
  3. @darkbart
Commits on Dec 4, 2012
  1. @darkbart

    newest debugger with support for ruby 1.9.3-p327

    darkbart authored Webmaster committed
  2. @darkbart

    bumping gems

    darkbart authored Webmaster committed
Commits on Dec 6, 2012
  1. @darkbart

    changing factories notation Factory -> FactoryGirl.create; added spec…

    darkbart authored Webmaster committed
    …_helper method for temporary use before test suite global fix; seeds.rb fixed
Commits on Jan 11, 2013
  1. rails 3.2.11

    Webmaster authored
  2. Merge branch 'bumping_engine'

    Webmaster authored
    Conflicts:
    	Gemfile
    	Gemfile.lock
    	spec/spec_helper.rb
Commits on Jan 20, 2013
  1. @darkbart

    Merge branch 'master' of github.com:avoinministerio/avoinministerio

    darkbart authored
    Conflicts:
    	Gemfile
    	Gemfile.lock
Commits on Mar 2, 2013
  1. @darkbart

    Merge branch 'master' of github.com:avoinministerio/avoinministerio

    darkbart authored
    Conflicts:
    	Gemfile
    	Gemfile.lock
    	spec/controllers/ideas_controller_spec.rb
    	spec/controllers/pages_controller_spec.rb
    	spec/models/idea_spec.rb
    	spec/spec_helper.rb
  2. @darkbart

    fixed spec_helper

    darkbart authored
Commits on Mar 5, 2013
  1. @darkbart

    Merge branch 'master' of github.com:avoinministerio/avoinministerio

    darkbart authored
    Conflicts:
    	config/environments/test.rb
Commits on Apr 1, 2013
  1. @darkbart
This page is out of date. Refresh to see the latest.
View
13 config/application.rb
@@ -40,6 +40,19 @@ class Application < Rails::Application
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password, :B02K_CUSTID]
+ # Enable escaping HTML in JSON.
+ config.active_support.escape_html_entities_in_json = true
+
+ # Use SQL instead of Active Record's schema dumper when creating the database.
+ # This is necessary if your schema can't be completely dumped by the schema dumper,
+ # like if you have constraints or database-specific column types
+ # config.active_record.schema_format = :sql
+ # Enforce whitelist mode for mass assignment.
+ # This will create an empty whitelist of attributes available for mass-assignment for all models
+ # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+ # parameters by using an attr_accessible or attr_protected declaration.
+ config.active_record.whitelist_attributes = true
+
# Enable the asset pipeline
config.assets.enabled = true
View
7 config/environments/development.rb
@@ -31,6 +31,13 @@
# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin
+ # Raise exception on mass assignment protection for Active Record models
+ config.active_record.mass_assignment_sanitizer = :strict
+
+ # Log the query plan for queries taking more than this (works
+ # with SQLite, MySQL, and PostgreSQL)
+ config.active_record.auto_explain_threshold_in_seconds = 0.5
+
# Do not compress assets
config.assets.compress = true
View
13 config/environments/production.rb
@@ -24,7 +24,7 @@
# Generate digests for assets URLs
config.assets.digest = true
- # Defaults to Rails.root.join("public/assets")
+ # Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH
# Specifies the header that your server uses for sending files
@@ -37,8 +37,11 @@
# See everything in the log (default is :info)
# config.log_level = :debug
+ # Prepend all log lines with the following tags
+ # config.log_tags = [ :subdomain, :uuid ]
+
# Use a different logger for distributed setups
- # config.logger = SyslogLogger.new
+ # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
# Use a different cache store in production
# config.cache_store = :mem_cache_store
@@ -77,6 +80,12 @@
config.action_mailer.default_url_options = { host: "avoinministerio.fi" }
+ # Log the query plan for queries taking more than this (works
+
+ # with SQLite, MySQL, and PostgreSQL)
+
+ # config.active_record.auto_explain_threshold_in_seconds = 0.5
+
config.middleware.insert_after(::Rack::Lock, "::Rack::Auth::Basic", "Avoin ministerio") do |u, p|
[u, p] == [ENV['AM_AUTH_USERNAME'], ENV['AM_AUTH_PASSWORD']]
end if ENV['AM_AUTH_PASSWORD']
View
5 config/initializers/inflections.rb
@@ -8,3 +8,8 @@
# inflect.irregular 'person', 'people'
# inflect.uncountable %w( fish sheep )
# end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+# inflect.acronym 'RESTful'
+# end
View
7 config/initializers/secret_token.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+AvoinMinisterio::Application.config.secret_token = '185a6e87f842e005bcf7eaa4bbd3824f01d70245e93c2745495a71e1bd147dfa3d6660dde7cc3f890b6cd206136843bd8b160c8fe92aacd347eaf2be93b05c01'
View
4 spec/spec_helper.rb
@@ -35,8 +35,8 @@ def min_ideas_for_homepage( multiply=1 )
# temporary used for pass homepage tests
# We will do different aproach after test_suite repair
ideas_count = Idea.count
- if ideas_count < (6*multiply)
- (6*multiply - ideas_count).times { FactoryGirl.create :idea }
+ if ideas_count < (3+3*multiply)
+ (12 - ideas_count).times { FactoryGirl.create :idea }
end
end
Something went wrong with that request. Please try again.