Skip to content
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

Jump to bottom

Upgrade Mongoid to 5.4 to support MongoDB 3.6 #1278

Merged
merged 3 commits into from Jul 5, 2018
Merged

Upgrade Mongoid to 5.4 to support MongoDB 3.6 #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9299f2
Upgrade Mongoid to 5.4 to support MongoDB 3.6
noniq Jul 4, 2018
68f290e
Fix error with constant lookup of `Regexp`
noniq Jul 4, 2018
1c89cd6
Update README regarding MongoDB version compatibility
noniq Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ env:
matrix:
- MONGODB=3.2.18
- MONGODB=3.4.10
- MONGODB=3.6.2

sudo: false

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ gem 'font-awesome-rails'
gem 'haml'
gem 'htmlentities'
gem 'kaminari', '>= 0.16.3'
gem 'mongoid', '5.0.2'
gem 'mongoid', '~> 5.4'
gem 'mongoid_rails_migrations'
gem 'rack-ssl', require: 'rack/ssl' # force SSL
gem 'rack-ssl-enforcer', require: false
Expand Down
23 changes: 12 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -53,8 +53,8 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bson (4.2.2)
bson (4.2.2-java)
bson (4.3.0)
bson (4.3.0-java)
builder (3.2.3)
byebug (4.0.5)
columnize (= 0.9.0)
Expand Down Expand Up @@ -156,7 +156,8 @@ GEM
httparty (0.13.5)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.8.6)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
Expand Down Expand Up @@ -184,13 +185,13 @@ GEM
mime-types (2.99.3)
mimemagic (0.3.0)
mini_portile2 (2.3.0)
minitest (5.10.3)
mongo (2.4.3)
bson (>= 4.2.1, < 5.0.0)
mongoid (5.0.2)
minitest (5.11.3)
mongo (2.6.0)
bson (>= 4.3.0, < 5.0.0)
mongoid (5.4.0)
activemodel (~> 4.0)
mongo (~> 2.1)
origin (~> 2.1)
mongo (>= 2.5.1, < 3.0.0)
origin (~> 2.3)
tzinfo (>= 0.3.37)
mongoid-rspec (3.0.0)
mongoid (~> 5.0)
Expand Down Expand Up @@ -401,7 +402,7 @@ GEM
tilt (2.0.7)
timecop (0.7.4)
tins (1.6.0)
tzinfo (1.2.3)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
Expand Down Expand Up @@ -465,7 +466,7 @@ DEPENDENCIES
kaminari (>= 0.16.3)
launchy
meta_request
mongoid (= 5.0.2)
mongoid (~> 5.4)
mongoid-rspec (~> 3.0.0)
mongoid_rails_migrations
omniauth-github
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@ updates and notifications.
The list of requirements to install Errbit are:

* Ruby 2.3.x-2.4.x (>= 2.5.x not yet supported)
* MongoDB 3.2.x-3.4.x (>= 3.6.x not yet supported)
* MongoDB 3.2.x-3.6.x (>= 4.0.x not yet supported)

Installation
------------
Expand Down
2 changes: 1 addition & 1 deletion app/models/app.rb
View file
Open in desktop
Expand Up @@ -219,7 +219,7 @@ def check_issue_tracker
def normalize_github_repo
return if github_repo.blank?
github_host = URI.parse(Errbit::Config.github_url).host
github_host = Regexp.escape(github_host)
github_host = ::Regexp.escape(github_host)
github_repo.strip!
github_repo.sub!(%r{(git@|https?://)#{github_host}(/|:)}, '')
github_repo.sub!(/\.git$/, '')
Expand Down