Skip to content

Commit

Permalink
Merge branch 'release/0.5'
Browse files Browse the repository at this point in the history
* release/0.5: (38 commits)
  some fixes
  #367 add names
  #367 some adds
  #367 fix height
  #367 add people
  #367 update styles
  #367 scrolling to element
  #367 year buttons
  #367 add confession javascript file
  #367 remove react motion
  #367 remove react motion
  some fix gems version
  fix sshkit
  fix
  comment test
  using latest bundler version
  fix
  fix
  fix
  fix
  ...
  • Loading branch information
kalashnikovisme committed Dec 7, 2015
2 parents 1286fa7 + c8e2b20 commit 98c859a
Show file tree
Hide file tree
Showing 61 changed files with 682 additions and 134 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ config/database.yml
Gemfile.lock
.capistrano/
!public/1.pdf
vendor/assets/bower*
vendor/assets/.bower*


\#*\#
Expand Down
25 changes: 9 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
language: ruby
rvm:
- 2.1
- 2.1
env:
- DB=postgres
- DB=postgres
before_install:
- gem install bundler
script:
- gem install tilt -v '1.4.1'
- gem install byebug -v '3.5.1'
- gem install sdoc -v '0.4.1'
- sudo pip install ansible
- make deps
- ansible-playbook -i cm/inventory cm/playbook.yml --tags 'test'
- RAILS_ENV=test bundle exec rake db:create db:migrate test
- sudo pip install ansible
- make deps
- ansible-playbook -i cm/inventory cm/playbook.yml --tags 'test'
- RAILS_ENV=test bundle exec rake db:create db:migrate test
services:
- redis-server
oauth_keys:
foursquare:
client_id:
secure: I68nKkRQmKe0IOGT9jpWxKM6zawYE0kInwfl95Mgs6vjoGr8pum1sdQxJHgu6EqQhk4DLKfPJMlPNHRtHveO5EokqUC56dw/ZZo9EMwQQYY53JAy5d3v7+6hYv2EhyA0xr1B0ovU+5/w36PGBQf7vlSM4Z97dYQdUDtTTZ3ENrI=
client_secret:
secure: GmKLLr6RQMdEkv1yQJCxYfCA2RUjon0gXFWBPCqy2zHFJNFvVX5p8ASzMSb3tIM+pltxAbrNhL8HzlY/Ddz4YYV6Y2chEDQVUuHbGjDQCdmD0e70/L406P9RhVqmQajS9wjY0SqTbcA+zhphLt1cd2tFrlFtAdSjCd3U/cCgViE=
- redis-server
Loading

0 comments on commit 98c859a

Please sign in to comment.