Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP]Return of the kceffect #15

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config
# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*.log
/log/*
!/log/.keep
/tmp

# Ignore rbenv local setting
.rbenv-version
31 changes: 18 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
source "https://rubygems.org"
source 'https://rubygems.org'

gem "rails", "3.2.13"
ruby "2.5.0"

gem 'rails', '4.2.10'

gem 'sqlite3'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jquery-rails'
gem 'jbuilder', '~> 2.0'

gem "jquery-rails"
gem "haml-rails"
gem "underscore-rails"
gem "font-awesome-rails"
gem "less-rails-bootstrap"
gem "therubyracer"

gem "bootstrap"
gem "kaminari"
gem "i18n_generators"
gem "active_decorator"
Expand All @@ -17,15 +23,14 @@ gem "omniauth"
gem "omniauth-twitter"
gem "twitter"

group :assets do
gem "sass-rails"
gem "coffee-rails"
gem "uglifier"
group :development, :test do
gem 'byebug'
gem 'pry'
end

group :development, :test do
gem "sqlite3"
gem "pry"
group :development do
gem 'web-console', '~> 2.0'
gem 'spring'
end

group :production do
Expand Down
Loading