From 67cd83dd967f358753d502ce9eb273c50c0bd13f Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Tue, 5 Oct 2010 16:25:04 -0700
Subject: [PATCH] releasing version 1.4.0

---
 CHANGELOG.rdoc | 2 +-
 cancan.gemspec | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 0a91eb6..5f11b2f 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,4 +1,4 @@
-1.4.0 (not yet released)
+1.4.0 (October 5, 2010)
 
 * Adding Gemfile; to get specs running just +bundle+ and +rake+ - see issue #163
 
diff --git a/cancan.gemspec b/cancan.gemspec
index 37f73e9..b067927 100644
--- a/cancan.gemspec
+++ b/cancan.gemspec
@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name        = "cancan"
-  s.version     = "1.4.0.beta1"
+  s.version     = "1.4.0"
   s.author      = "Ryan Bates"
   s.email       = "ryan@railscasts.com"
   s.homepage    = "http://github.com/ryanb/cancan"
   s.summary     = "Simple authorization solution for Rails."
   s.description = "Simple authorization solution for Rails which is decoupled from user roles. All permissions are stored in a single location."
 
-  s.files        = Dir["{lib,spec}/**/*", "[A-Z]*", "init.rb"]
+  s.files        = Dir["{lib,spec}/**/*", "[A-Z]*", "init.rb"] - ["Gemfile.lock"]
   s.require_path = "lib"
 
   s.add_development_dependency 'rspec', '~> 2.0.0.beta.22'