diff --git a/.gitignore b/.gitignore index 067415f..c9852b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,55 +1,12 @@ -# Created by https://www.gitignore.io/api/ruby,rails,rubymine - -### Rails ### -*.rbc -capybara-*.html -.rspec -/log -/tmp -/db/*.sqlite3 -/db/*.sqlite3-journal -/public/system -/coverage/ -/spec/tmp -*.orig -rerun.txt -pickle-email-*.html - -# TODO Comment out this rule if you are OK with secrets being uploaded to the repo -config/initializers/secret_token.rb - -# Only include if you have production secrets in this file, which is no longer a Rails default -# config/secrets.yml - -# dotenv -# TODO Comment out this rule if environment variables can be committed -.env - -## Environment normalization: -/.bundle -/vendor/bundle - -# these should all be checked in to normalize the environment: -# Gemfile.lock, .ruby-version, .ruby-gemset - -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc - -# if using bower-rails ignore default bower_components path bower.json files -/vendor/assets/bower_components -*.bowerrc -bower.json - -# Ignore pow environment settings -.powenv - -# Ignore Byebug command history file. -.byebug_history +# Created by https://www.gitignore.io/api/ruby +# Edit at https://www.gitignore.io/?templates=ruby ### Ruby ### *.gem +*.rbc /.config +/coverage/ /InstalledFiles /pkg/ /spec/reports/ @@ -61,6 +18,9 @@ bower.json # Used by dotenv library to load environment variables. # .env +# Ignore Byebug command history file. +.byebug_history + ## Specific to RubyMotion: .dat* .repl_history @@ -74,7 +34,6 @@ build-iPhoneSimulator/ # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control -# # vendor/Pods/ ## Documentation cache and generated files: @@ -85,6 +44,7 @@ build-iPhoneSimulator/ ## Environment normalization: /.bundle/ +/vendor/bundle /lib/bundler/man/ # for a library or gem, you might want to ignore these files since the code is @@ -94,71 +54,6 @@ build-iPhoneSimulator/ # .ruby-gemset # unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc -### RubyMine ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/dictionaries - -# Sensitive or high-churn files: -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.xml -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml - -# Gradle: -.idea/**/gradle.xml -.idea/**/libraries - -# CMake -cmake-build-debug/ - -# Mongo Explorer plugin: -.idea/**/mongoSettings.xml - -## File-based project format: -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Ruby plugin and RubyMine -/.rakeTasks - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -### RubyMine Patch ### -# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 - -# *.iml -# modules.xml -# .idea/misc.xml -# *.ipr - -# Sonarlint plugin -.idea/sonarlint -.idea/workspace.xml - -# End of https://www.gitignore.io/api/ruby,rails,rubymine +# End of https://www.gitignore.io/api/ruby diff --git a/Gemfile b/Gemfile index 364e8ba..a3f707b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end -ruby '2.5.1' +ruby '2.6.4' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 065ba42..6fdbebe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 2.5.1p57 + ruby 2.6.4p104 BUNDLED WITH - 1.16.2 + 2.0.2 diff --git a/bin/bundle b/bin/bundle old mode 100755 new mode 100644 diff --git a/bin/rails b/bin/rails old mode 100755 new mode 100644 diff --git a/bin/rake b/bin/rake old mode 100755 new mode 100644 diff --git a/bin/setup b/bin/setup old mode 100755 new mode 100644 diff --git a/bin/spring b/bin/spring old mode 100755 new mode 100644 diff --git a/bin/update b/bin/update old mode 100755 new mode 100644