Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote branch 'upstream/master'

  • Loading branch information...
commit a61d6503177b0ee06c5559285159554caa6beb2b 2 parents d9e0fd9 + 2e138a4
leon authored

Showing 3 changed files with 11 additions and 7 deletions. Show diff stats Hide diff stats

  1. +1 1  Gemfile
  2. +1 1  VERSION
  3. +9 5 pivotal-tracker.gemspec
2  Gemfile
... ... @@ -1,7 +1,7 @@
1 1 source 'http://rubygems.org'
2 2
3 3 group :runtime do
4   - gem 'rest-client', '~> 1.4.1'
  4 + gem 'rest-client', '~> 1.5.1'
5 5 gem 'happymapper', '>= 0.2.4'
6 6 gem 'builder'
7 7 gem 'nokogiri', '~> 1.4.1'
2  VERSION
... ... @@ -1 +1 @@
1   -0.1.3
  1 +0.2.0
14 pivotal-tracker.gemspec
@@ -5,11 +5,11 @@
5 5
6 6 Gem::Specification.new do |s|
7 7 s.name = %q{pivotal-tracker}
8   - s.version = "0.1.3"
  8 + s.version = "0.2.0"
9 9
10 10 s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11 11 s.authors = ["Justin Smestad", "Josh Nichols", "Terence Lee"]
12   - s.date = %q{2010-05-09}
  12 + s.date = %q{2010-07-05}
13 13 s.email = %q{justin.smestad@gmail.com}
14 14 s.extra_rdoc_files = [
15 15 "LICENSE",
@@ -36,12 +36,14 @@ Gem::Specification.new do |s|
36 36 "lib/pivotal_tracker.rb",
37 37 "pivotal-tracker.gemspec",
38 38 "spec/fixtures/activity.xml",
  39 + "spec/fixtures/created_note.xml",
39 40 "spec/fixtures/created_story.xml",
40 41 "spec/fixtures/iterations_all.xml",
41 42 "spec/fixtures/iterations_backlog.xml",
42 43 "spec/fixtures/iterations_current.xml",
43 44 "spec/fixtures/iterations_done.xml",
44 45 "spec/fixtures/memberships.xml",
  46 + "spec/fixtures/notes.xml",
45 47 "spec/fixtures/project.xml",
46 48 "spec/fixtures/project_activity.xml",
47 49 "spec/fixtures/projects.xml",
@@ -54,6 +56,7 @@ Gem::Specification.new do |s|
54 56 "spec/unit/pivotal-tracker/activity_spec.rb",
55 57 "spec/unit/pivotal-tracker/iteration_spec.rb",
56 58 "spec/unit/pivotal-tracker/membership_spec.rb",
  59 + "spec/unit/pivotal-tracker/note_spec.rb",
57 60 "spec/unit/pivotal-tracker/project_spec.rb",
58 61 "spec/unit/pivotal-tracker/story_spec.rb",
59 62 "spec/unit/pivotal-tracker/task_spec.rb"
@@ -69,6 +72,7 @@ Gem::Specification.new do |s|
69 72 "spec/unit/pivotal-tracker/activity_spec.rb",
70 73 "spec/unit/pivotal-tracker/iteration_spec.rb",
71 74 "spec/unit/pivotal-tracker/membership_spec.rb",
  75 + "spec/unit/pivotal-tracker/note_spec.rb",
72 76 "spec/unit/pivotal-tracker/project_spec.rb",
73 77 "spec/unit/pivotal-tracker/story_spec.rb",
74 78 "spec/unit/pivotal-tracker/task_spec.rb"
@@ -79,18 +83,18 @@ Gem::Specification.new do |s|
79 83 s.specification_version = 3
80 84
81 85 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
82   - s.add_runtime_dependency(%q<rest-client>, ["~> 1.4.1"])
  86 + s.add_runtime_dependency(%q<rest-client>, ["~> 1.5.1"])
83 87 s.add_runtime_dependency(%q<happymapper>, [">= 0.2.4"])
84 88 s.add_runtime_dependency(%q<builder>, [">= 0"])
85 89 s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.1"])
86 90 else
87   - s.add_dependency(%q<rest-client>, ["~> 1.4.1"])
  91 + s.add_dependency(%q<rest-client>, ["~> 1.5.1"])
88 92 s.add_dependency(%q<happymapper>, [">= 0.2.4"])
89 93 s.add_dependency(%q<builder>, [">= 0"])
90 94 s.add_dependency(%q<nokogiri>, ["~> 1.4.1"])
91 95 end
92 96 else
93   - s.add_dependency(%q<rest-client>, ["~> 1.4.1"])
  97 + s.add_dependency(%q<rest-client>, ["~> 1.5.1"])
94 98 s.add_dependency(%q<happymapper>, [">= 0.2.4"])
95 99 s.add_dependency(%q<builder>, [">= 0"])
96 100 s.add_dependency(%q<nokogiri>, ["~> 1.4.1"])

0 comments on commit a61d650

Please sign in to comment.
Something went wrong with that request. Please try again.