Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mathiesen <marius@gitorious.org>2013-01-09 07:53:01 (GMT)
committer Marius Mathiesen <marius@gitorious.org>2013-01-09 07:53:01 (GMT)
commitded49bbc1b9922f4f89343baec1829b5439d4d87 (patch)
tree43cc2fcb03f5d7ec93a0b12702c35bbb696ae1da
parentd291c096b5528e0ee39a10cc73f601a5e1a70ad3 (diff)
Gitorious 2.4.5
This release fixes the vulnerability CVE-2013-0156.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock36
-rw-r--r--config/environment.rb2
-rw-r--r--lib/gitorious.rb2
4 files changed, 21 insertions, 21 deletions
diff --git a/Gemfile b/Gemfile
index 7aef161..f8d8caf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source "http://rubygems.org"
-gem "rails", "2.3.14"
+gem "rails", "2.3.15"
gem "chronic", "0.3.0"
gem "geoip", "0.8.9"
gem "daemons", "1.1.0", :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index f74be46..f5d9d6f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,22 +8,22 @@ GEM
remote: http://rubygems.org/
specs:
SystemTimer (1.2.3)
- actionmailer (2.3.14)
- actionpack (= 2.3.14)
- actionpack (2.3.14)
- activesupport (= 2.3.14)
- rack (~> 1.1.0)
+ actionmailer (2.3.15)
+ actionpack (= 2.3.15)
+ actionpack (2.3.15)
+ activesupport (= 2.3.15)
+ rack (~> 1.1.3)
activemessaging (0.7.1)
activesupport (>= 1.0.0)
- activerecord (2.3.14)
- activesupport (= 2.3.14)
+ activerecord (2.3.15)
+ activesupport (= 2.3.15)
activerecord-jdbc-adapter (1.2.2.1)
activerecord-jdbcmysql-adapter (1.2.2.1)
activerecord-jdbc-adapter (~> 1.2.2.1)
jdbc-mysql (~> 5.1.0)
- activeresource (2.3.14)
- activesupport (= 2.3.14)
- activesupport (2.3.14)
+ activeresource (2.3.15)
+ activesupport (= 2.3.15)
+ activesupport (2.3.15)
acts-as-taggable-on (2.0.6)
addressable (2.2.8)
after_commit (1.0.10)
@@ -90,15 +90,15 @@ GEM
mime-types
proxymachine (1.2.4)
eventmachine (>= 0.12.10)
- rack (1.1.3)
+ rack (1.1.4)
rack-test (0.6.2)
rack (>= 1.0)
- rails (2.3.14)
- actionmailer (= 2.3.14)
- actionpack (= 2.3.14)
- activerecord (= 2.3.14)
- activeresource (= 2.3.14)
- activesupport (= 2.3.14)
+ rails (2.3.15)
+ actionmailer (= 2.3.15)
+ actionpack (= 2.3.15)
+ activerecord (= 2.3.15)
+ activeresource (= 2.3.15)
+ activesupport (= 2.3.15)
rake (>= 0.8.3)
raindrops (0.10.0)
rake (0.8.7)
@@ -192,7 +192,7 @@ DEPENDENCIES
oauth (= 0.4.4)
paperclip (~> 2.7.2)
proxymachine (= 1.2.4)
- rails (= 2.3.14)
+ rails (= 2.3.15)
rake (= 0.8.7)
rdiscount (= 1.3.1.1)
resque (= 1.9.8)
diff --git a/config/environment.rb b/config/environment.rb
index 7745b74..bd06aaf 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -4,7 +4,7 @@
# you don't control web/app server and can't set it the proper way
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
diff --git a/lib/gitorious.rb b/lib/gitorious.rb
index bcacdf3..b383289 100644
--- a/lib/gitorious.rb
+++ b/lib/gitorious.rb
@@ -16,5 +16,5 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#++
module Gitorious
- VERSION = "2.4.4"
+ VERSION = "2.4.5"
end