Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed merge conflict

  • Loading branch information...
commit b365460a8240ce5d722c10d62b2931cfd819b0e2 2 parents ef7673f + eac5781
@jeffWelling jeffWelling authored
View
1  .rvmrc
@@ -0,0 +1 @@
+rvm use --create default@ticgit
View
26 Gemfile.lock
@@ -3,23 +3,21 @@ GEM
specs:
diff-lcs (1.1.2)
git (1.2.5)
- haml (3.0.23)
+ haml (3.0.25)
rack (1.2.1)
rake (0.8.7)
- rspec (2.0.1)
- rspec-core (~> 2.0.1)
- rspec-expectations (~> 2.0.1)
- rspec-mocks (~> 2.0.1)
- rspec-core (2.0.1)
- rspec-expectations (2.0.1)
- diff-lcs (>= 1.1.2)
- rspec-mocks (2.0.1)
- rspec-core (~> 2.0.1)
- rspec-expectations (~> 2.0.1)
- sinatra (1.1.0)
+ rspec (2.4.0)
+ rspec-core (~> 2.4.0)
+ rspec-expectations (~> 2.4.0)
+ rspec-mocks (~> 2.4.0)
+ rspec-core (2.4.0)
+ rspec-expectations (2.4.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.4.0)
+ sinatra (1.1.2)
rack (~> 1.1)
- tilt (~> 1.1)
- tilt (1.1)
+ tilt (~> 1.2)
+ tilt (1.2.2)
PLATFORMS
ruby
View
39 Rakefile
@@ -10,45 +10,6 @@
end
exit 1 if $load_error
-# This namespace must be loaded near the top in order to be able to
-# display bundle-related rake tasks in the next section.
-namespace :bundle do
- namespace :install do
- desc 'Install gems for all tasks, including testing.'
- task :all do
- system 'bundle install'
- end
-
- desc 'Install standard CLI and web dependencies.'
- task :std do
- system 'bundle install --without dev'
- end
-
- # The gem will not currently build properly without the ticgitweb
- # dependencies. Leave this task commented until the gemspec will
- # build just the CLI.
- #desc 'Install CLI dependencies only.'
- #task :cli do
- # system 'bundle install --without dev web'
- #end
- end
-
- desc 'List bundled gems.'
- task :show do
- system 'bundle show'
- end
-end
-
-# If 'bundler install' hasn't been run, display the available bundler
-# tasks.
-unless File.directory? '.bundle'
- $stderr.puts 'You must run one of the bundle:install tasks first:'
- $stderr.puts
- Rake::Task.tasks.each {|task| $stderr.puts " rake #{task}"}
- $stderr.puts
- exit 1 if ARGV.to_s.grep(/bundle:install/).empty?
-end
-
require 'bundler/setup'
require 'rake/gempackagetask'
View
0  tasks/authors.rake → rakelib/authors.rake
File renamed without changes
View
0  tasks/bacon.rake → rakelib/bacon.rake
File renamed without changes
View
0  tasks/changelog.rake → rakelib/changelog.rake
File renamed without changes
View
0  tasks/cucumber.rake → rakelib/cucumber.rake
File renamed without changes
View
0  tasks/gem.rake → rakelib/gem.rake
File renamed without changes
View
0  tasks/gem_installer.rake → rakelib/gem_installer.rake
File renamed without changes
View
0  tasks/git.rake → rakelib/git.rake
File renamed without changes
View
0  tasks/grancher.rake → rakelib/grancher.rake
File renamed without changes
View
0  tasks/install_dependencies.rake → rakelib/install_dependencies.rake
File renamed without changes
View
0  tasks/manifest.rake → rakelib/manifest.rake
File renamed without changes
View
0  tasks/metric_changes.rake → rakelib/metric_changes.rake
File renamed without changes
View
0  tasks/rcov.rake → rakelib/rcov.rake
File renamed without changes
View
0  tasks/release.rake → rakelib/release.rake
File renamed without changes
View
0  tasks/reversion.rake → rakelib/reversion.rake
File renamed without changes
View
0  tasks/setup.rake → rakelib/setup.rake
File renamed without changes
View
0  tasks/todo.rake → rakelib/todo.rake
File renamed without changes
View
0  tasks/traits.rake → rakelib/traits.rake
File renamed without changes
View
0  tasks/yard.rake → rakelib/yard.rake
File renamed without changes
View
0  tasks/ycov.rake → rakelib/ycov.rake
File renamed without changes

0 comments on commit b365460

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