Skip to content
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
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.4.1'
ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
gem 'bootstrap-sass', '~> 3.3.7'
# gem 'bootstrap-sass', '~> 3.3.7'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use Puma as the app server
Expand Down Expand Up @@ -66,6 +66,6 @@ end
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :production do
gem 'pg', '0.20.0'
# gem 'pg', '0.20.0'
gem 'fog', '1.42'
end
30 changes: 11 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,10 @@ GEM
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (9.0.0)
autoprefixer-rails (9.1.3)
execjs
bcrypt (3.1.12)
bindex (0.5.0)
bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bootstrap-will_paginate (1.0.0)
will_paginate
builder (3.2.3)
Expand Down Expand Up @@ -85,12 +80,12 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.4)
crass (1.0.4)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
dry-inflector (0.1.2)
erubi (1.7.1)
erubi (1.8.0)
excon (0.62.0)
execjs (2.7.0)
ffi (1.9.25)
Expand Down Expand Up @@ -255,7 +250,7 @@ GEM
activesupport (>= 4.2.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.1.1)
i18n (1.4.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
ipaddress (0.8.3)
Expand All @@ -282,20 +277,19 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mimemagic (0.3.2)
mimemagic (0.3.3)
mini_magick (4.9.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.2.4)
multi_json (1.13.1)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.9.1)
mini_portile2 (~> 2.4.0)
ovirt-engine-sdk (4.2.5)
json (>= 1, < 3)
pg (0.20.0)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.6)
Expand Down Expand Up @@ -327,8 +321,8 @@ GEM
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
rbovirt (0.1.7)
nokogiri
rest-client (> 1.7.0)
Expand Down Expand Up @@ -405,7 +399,6 @@ PLATFORMS
DEPENDENCIES
bcrypt (~> 3.1.7)
bootsnap (>= 1.1.0)
bootstrap-sass (~> 3.3.7)
bootstrap-will_paginate (= 1.0.0)
byebug
capybara (>= 2.15)
Expand All @@ -417,7 +410,6 @@ DEPENDENCIES
jquery-rails
listen (>= 3.0.5, < 3.2)
mini_magick (~> 4.8)
pg (= 0.20.0)
puma (~> 3.11)
rails (~> 5.2.1)
sass-rails (~> 5.0)
Expand All @@ -432,7 +424,7 @@ DEPENDENCIES
will_paginate (= 3.1.6)

RUBY VERSION
ruby 2.4.1p111
ruby 2.5.1p57

BUNDLED WITH
1.16.2
2.0.1
Binary file added app/assets/images/169.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/dummy.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/gallery1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/robo.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/wide.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
//
//= require jquery
//= require jquery_ujs
//= require bootstrap
//= require rails-ujs
//= require activestorage
//= require turbolinks
Expand Down
3 changes: 0 additions & 3 deletions app/assets/stylesheets/conversations.scss

This file was deleted.

256 changes: 0 additions & 256 deletions app/assets/stylesheets/custom.scss

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/stylesheets/messages.scss

This file was deleted.

Loading