Skip to content

Pks/fixing cli setup #2

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.

Sign up for GitHub

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

Merged
shaabans merged 2 commits into from
Feb 18, 2014
Merged

Pks/fixing cli setup #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a39af2
Adding default bin directory back to application
ninjapanzer Feb 18, 2014
60b8c15
Adjusted gems that no longer have valid branches
ninjapanzer Feb 18, 2014
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ gem 'debugger', group: [:development, :test]

# Project specific
gem 'sass-rails', '~> 4.0.0'
gem 'bootstrap-sass', :github => 'thomas-mcdonald/bootstrap-sass', branch: '3'
gem 'bootstrap-sass', '~> 3.1.1.0'
gem 'haml'
gem 'best_in_place', :github => 'bernat/best_in_place', branch: 'rails-4'
gem 'kaminari'
12 changes: 3 additions & 9 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ GIT
jquery-rails
rails (~> 4)

GIT
remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964
branch: 3
specs:
bootstrap-sass (3.0.0.0)
sass (~> 3.2)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -44,6 +36,8 @@ GEM
tzinfo (~> 0.3.37)
arel (4.0.0)
atomic (1.1.14)
bootstrap-sass (3.1.1.0)
sass (~> 3.2)
builder (3.1.4)
coffee-rails (4.0.0)
coffee-script (>= 2.2.0)
Expand Down Expand Up @@ -138,7 +132,7 @@ PLATFORMS

DEPENDENCIES
best_in_place!
bootstrap-sass!
bootstrap-sass (~> 3.1.1.0)
coffee-rails (~> 4.0.0)
debugger
haml
Expand Down
3 changes: 3 additions & 0 deletions bin/bundle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env ruby
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
load Gem.bin_path('bundler', 'bundle')
4 changes: 4 additions & 0 deletions bin/rails
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env ruby
APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
require 'rails/commands'
4 changes: 4 additions & 0 deletions bin/rake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env ruby
require_relative '../config/boot'
require 'rake'
Rake.application.run