Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-11 07:02:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source
This commit is contained in:
Reinier Balt 2013-06-25 16:51:05 +02:00
commit b79efb3f31
2 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Gemfile
View file

@ -1,8 +1,8 @@
source 'https://rubygems.org'
gem 'rails', '4.0.0.rc2'
gem 'sass-rails', '4.0.0.rc2'
gem 'coffee-rails', '~>4.0'
gem 'rails', '~>4.0.0'
gem 'sass-rails', '~>4.0.0'
gem 'coffee-rails', '~>4.0.0'
# todo: remove xml api
gem 'actionpack-xml_parser', github: 'rails/actionpack-xml_parser'
@ -42,13 +42,13 @@ gem "cache_digests"
gem "rack-mini-profiler"
# To use ActiveModel has_secure_password
gem 'bcrypt-ruby'
gem 'bcrypt-ruby', '~> 3.0.0'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
# gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 1.0.1'
# gem 'jbuilder', '~> 1.2'
group :development do
gem "yard"