Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-05 20:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/controllers/todos_controller.rb
	app/services/rich_message_extractor.rb
	app/services/todo_from_rich_message.rb
	app/views/todos/all_done.html.erb
	config/initializers/rack-mini-profiler.rb
	test/models/rich_message_extractor_test.rb
	test/models/todo_from_rich_message_test.rb
This commit is contained in:
Reinier Balt 2014-03-06 10:31:39 +01:00
commit 899df1ef8f
33 changed files with 1487 additions and 1313 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Gemfile
View file

@ -6,7 +6,7 @@ gem 'coffee-rails', '~>4.0.0'
gem 'json'
# todo: remove xml api
# todo: remove xml api
gem 'actionpack-xml_parser', git: 'https://github.com/rails/actionpack-xml_parser'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
@ -25,7 +25,7 @@ gem 'twitter-bootstrap-rails'
#gem 'twitter-bootstrap-rails', github: 'seyhunak/twitter-bootstrap-rails', branch: "master"
# you may comment out the database driver you will not be using.
# This will prevent a native build of the driver. Building native drivers is not
# This will prevent a native build of the driver. Building native drivers is not
# always possible on all hosters
gem "sqlite3"
gem "mysql2"
@ -42,7 +42,7 @@ gem "htmlentities"
gem "swf_fu"
gem "rails_autolink"
gem "cache_digests"
gem "rack-mini-profiler"
gem "highline" # for reset_password rake task
# To use ActiveModel has_secure_password
gem 'bcrypt-ruby', '~> 3.0.0'
@ -55,8 +55,10 @@ gem 'turbolinks'
group :development do
gem "yard"
gem "tolk"
gem "tolk", git: 'https://github.com/tolk/tolk'
gem 'protected_attributes' # needed for tolk. remove when tolk updates
gem "bullet"
gem "rack-mini-profiler"
end
group :test do
@ -70,13 +72,13 @@ group :test do
gem "aruba", git: 'https://github.com/cucumber/aruba', :require => false # need 0.5.4 for piping files; 0.5.3 is latest
gem "timecop", "~> 0.6.2"
# Note that > 2.14 has problems, see:
# Note that > 2.14 has problems, see:
# https://code.google.com/p/selenium/issues/detail?id=3075
gem "selenium-webdriver"
gem "selenium-webdriver"
# uncomment to use the webkit option. This depends on Qt being installed
# gem "capybara-webkit"
# uncomment to be able to make screenshots from scenarios
#gem "capybara-screenshot"
#gem "launchy"