Skip to content

Commit

Permalink
updated gem file
Browse files Browse the repository at this point in the history
  • Loading branch information
ingridh committed Mar 14, 2015
1 parent 64c7b2e commit 3c20b5f
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 9 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ gem 'rails', '3.2.16'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'ruql', :path => './ruql/'
gem 'ruql'
gem 'omniauth'
gem 'omniauth-github'
gem 'bootstrap-sass', '~> 3.3.3'

group :development, :test do
gem 'sqlite3'
Expand Down
19 changes: 11 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
PATH
remote: ./ruql/
specs:
ruql (0.0.4)
builder
getopt

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -37,6 +30,12 @@ GEM
multi_json (~> 1.0)
archive-tar-minitar (0.5.2)
arel (3.0.3)
autoprefixer-rails (5.1.7)
execjs
json
bootstrap-sass (3.3.3)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
builder (3.0.4)
capybara (2.4.4)
mime-types (>= 1.16)
Expand Down Expand Up @@ -166,6 +165,9 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
ruql (0.0.4)
builder
getopt
sass (3.4.13)
sass-rails (3.2.6)
railties (~> 3.2.0)
Expand Down Expand Up @@ -201,6 +203,7 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass (~> 3.3.3)
coffee-rails (~> 3.2.1)
cucumber-rails
database_cleaner
Expand All @@ -212,7 +215,7 @@ DEPENDENCIES
rails (= 3.2.16)
rspec-rails (~> 2.14.0)
ruby-debug19
ruql!
ruql
sass-rails (~> 3.2.3)
simplecov
sqlite3
Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/problems.css.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Place all the styles related to the questions controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
#main {
margin: 30px;
line-height: 20px;
}
10 changes: 10 additions & 0 deletions features/support/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,13 @@
end"

)

Problem.create(created_by: "fox",created_date: '2014-06-09 21:11:55 UTC', is_public: true, text:
"choice_answer :randomize => true do
text 'The ----- tier of three-tier SaaS apps is the most complicated to scale.'
answer 'Presentation'
distractor 'Logic'
distractor 'Persistence'
distractor 'Database'
end"
)
Binary file added saasquizes_test
Binary file not shown.

0 comments on commit 3c20b5f

Please sign in to comment.