Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

readd face gem and remove database.yml now that we'll be using our ow…

…n mysql configs
  • Loading branch information...
commit e9e3225d1b60de0ef7d83864278cae692bab5391 1 parent cae72b7
Milo Winningham authored
3  .gitignore
@@ -7,8 +7,9 @@
7 7 # Ignore bundler config
8 8 /.bundle
9 9
10   -# Ignore the default SQLite database.
  10 +# Ignore the database and its configuration.
11 11 /db/*.sqlite3
  12 +/config/database.yml
12 13
13 14 # Ignore all logfiles and tempfiles.
14 15 /log/*.log
1  Gemfile
@@ -16,6 +16,7 @@ group :development, :test do
16 16 end
17 17
18 18 gem 'activerecord-mysql2spatial-adapter'
  19 +gem 'face'
19 20 gem 'geokit'
20 21 gem 'instagram', "~> 0.8.3"
21 22 gem 'jquery-rails'
14 Gemfile.lock
@@ -22,6 +22,9 @@ GEM
22 22 activesupport (= 3.2.2)
23 23 arel (~> 3.0.2)
24 24 tzinfo (~> 0.3.29)
  25 + activerecord-mysql2spatial-adapter (0.4.2)
  26 + mysql2 (>= 0.2.13)
  27 + rgeo-activerecord (~> 0.4.3)
25 28 activeresource (3.2.2)
26 29 activemodel (= 3.2.2)
27 30 activesupport (= 3.2.2)
@@ -61,6 +64,8 @@ GEM
61 64 faraday_middleware (0.8.4)
62 65 faraday (>= 0.7.4, < 0.9)
63 66 ffi (1.0.11)
  67 + geokit (1.6.5)
  68 + multi_json
64 69 hashie (1.2.0)
65 70 hike (1.2.1)
66 71 i18n (0.6.0)
@@ -81,6 +86,7 @@ GEM
81 86 mime-types (1.17.2)
82 87 multi_json (1.0.4)
83 88 multipart-post (1.1.5)
  89 + mysql2 (0.3.11)
84 90 nokogiri (1.5.0)
85 91 polyglot (0.3.3)
86 92 rack (1.4.1)
@@ -110,6 +116,11 @@ GEM
110 116 json (~> 1.4)
111 117 rest-client (1.6.7)
112 118 mime-types (>= 1.16)
  119 + rgeo (0.3.5)
  120 + rgeo-activerecord (0.4.3)
  121 + activerecord (>= 3.0.3)
  122 + arel (>= 2.0.6)
  123 + rgeo (>= 0.3.4)
113 124 rspec (2.8.0)
114 125 rspec-core (~> 2.8.0)
115 126 rspec-expectations (~> 2.8.0)
@@ -155,11 +166,14 @@ PLATFORMS
155 166 ruby
156 167
157 168 DEPENDENCIES
  169 + activerecord-mysql2spatial-adapter
158 170 capybara
159 171 coffee-rails (~> 3.2.1)
160 172 face
  173 + geokit
161 174 instagram (~> 0.8.3)
162 175 jquery-rails
  176 + mysql2
163 177 rails (= 3.2.2)
164 178 rspec-rails
165 179 sass-rails (~> 3.2.3)
25 config/database.yml
... ... @@ -1,25 +0,0 @@
1   -# SQLite version 3.x
2   -# gem install sqlite3
3   -#
4   -# Ensure the SQLite 3 gem is defined in your Gemfile
5   -# gem 'sqlite3'
6   -development:
7   - adapter: sqlite3
8   - database: db/development.sqlite3
9   - pool: 5
10   - timeout: 5000
11   -
12   -# Warning: The database defined as "test" will be erased and
13   -# re-generated from your development database when you run "rake".
14   -# Do not set this db to the same as development or production.
15   -test:
16   - adapter: sqlite3
17   - database: db/test.sqlite3
18   - pool: 5
19   - timeout: 5000
20   -
21   -production:
22   - adapter: sqlite3
23   - database: db/production.sqlite3
24   - pool: 5
25   - timeout: 5000

0 comments on commit e9e3225

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