Skip to content

Commit dbbf3b9

Browse files
committed
ruby version
1 parent a6ff04a commit dbbf3b9

5 files changed

Lines changed: 8 additions & 26 deletions

File tree

.ruby-gemset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
my-budget

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby-2.2.1

Gemfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
source 'https://rubygems.org'
22

3-
43
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
54
gem 'rails', '4.2.3'
6-
# Use sqlite3 as the database for Active Record
7-
gem 'sqlite3'
8-
9-
gem 'mysql2'
105

116
gem 'pg'
127

138
gem 'composite_primary_keys'
149

15-
gem 'datagrid'
1610
# Use SCSS for stylesheets
1711
gem 'sass-rails', '~> 5.0'
1812
# Use Uglifier as compressor for JavaScript assets
@@ -55,6 +49,3 @@ group :development, :test do
5549
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
5650
gem 'spring'
5751
end
58-
59-
60-
gem 'kaminari'

Gemfile.lock

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ GEM
5959
coffee-script-source (1.9.1.1)
6060
composite_primary_keys (8.1.1)
6161
activerecord (~> 4.2.0)
62-
datagrid (1.3.9)
63-
rails (>= 3.2.18)
6462
debug_inspector (0.0.2)
6563
erubis (2.7.0)
6664
execjs (2.6.0)
@@ -75,9 +73,6 @@ GEM
7573
railties (>= 4.2.0)
7674
thor (>= 0.14, < 2.0)
7775
json (1.8.3)
78-
kaminari (0.16.3)
79-
actionpack (>= 3.0.0)
80-
activesupport (>= 3.0.0)
8176
loofah (2.0.3)
8277
nokogiri (>= 1.5.9)
8378
mail (2.6.3)
@@ -87,7 +82,6 @@ GEM
8782
mini_portile (0.6.2)
8883
minitest (5.8.0)
8984
multi_json (1.11.2)
90-
mysql2 (0.3.18)
9185
nokogiri (1.6.6.2)
9286
mini_portile (~> 0.6.0)
9387
pg (0.18.2)
@@ -144,7 +138,6 @@ GEM
144138
actionpack (>= 3.0)
145139
activesupport (>= 3.0)
146140
sprockets (>= 2.8, < 4.0)
147-
sqlite3 (1.3.10)
148141
thor (0.19.1)
149142
thread_safe (0.3.5)
150143
tilt (1.4.1)
@@ -171,21 +164,17 @@ DEPENDENCIES
171164
cocoon
172165
coffee-rails (~> 4.1.0)
173166
composite_primary_keys
174-
datagrid
175167
jbuilder (~> 2.0)
176168
jquery-rails
177-
kaminari
178-
mysql2
179169
pg
180170
pry-rails
181171
rails (= 4.2.3)
182172
sass-rails (~> 5.0)
183173
sdoc (~> 0.4.0)
184174
spring
185-
sqlite3
186175
turbolinks
187176
uglifier (>= 1.3.0)
188177
web-console (~> 2.0)
189178

190179
BUNDLED WITH
191-
1.10.5
180+
1.10.6

config/routes.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Rails.application.routes.draw do
2-
root 'mybudget#index'
2+
root 'mybudgets#index'
33

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

0 commit comments

Comments
 (0)