Skip to content

Commit

Permalink
ruby version
Browse files Browse the repository at this point in the history
  • Loading branch information
SelenaSmall committed Sep 19, 2015
1 parent a6ff04a commit dbbf3b9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 26 deletions.
1 change: 1 addition & 0 deletions .ruby-gemset
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
my-budget
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.2.1
9 changes: 0 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.3'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

gem 'mysql2'

gem 'pg'

gem 'composite_primary_keys'

gem 'datagrid'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -55,6 +49,3 @@ group :development, :test do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end


gem 'kaminari'
13 changes: 1 addition & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ GEM
coffee-script-source (1.9.1.1)
composite_primary_keys (8.1.1)
activerecord (~> 4.2.0)
datagrid (1.3.9)
rails (>= 3.2.18)
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.6.0)
Expand All @@ -75,9 +73,6 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
Expand All @@ -87,7 +82,6 @@ GEM
mini_portile (0.6.2)
minitest (5.8.0)
multi_json (1.11.2)
mysql2 (0.3.18)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.2)
Expand Down Expand Up @@ -144,7 +138,6 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
Expand All @@ -171,21 +164,17 @@ DEPENDENCIES
cocoon
coffee-rails (~> 4.1.0)
composite_primary_keys
datagrid
jbuilder (~> 2.0)
jquery-rails
kaminari
mysql2
pg
pry-rails
rails (= 4.2.3)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

BUNDLED WITH
1.10.5
1.10.6
10 changes: 5 additions & 5 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Rails.application.routes.draw do
root 'mybudget#index'
root 'mybudgets#index'

resources :mybudgets, except: [:index] do
resources :incomes, except: [:show, :index]
resources :expenses, except: [:show, :index]
end
resources :mybudgets, except: [:index] do
resources :incomes, except: [:show, :index]
resources :expenses, except: [:show, :index]
end
# The priority is based upon order of creation: first created -> highest priority.
# See how all your routes lay out with "rake routes".

Expand Down

0 comments on commit dbbf3b9

Please sign in to comment.