Skip to content

Commit

Permalink
More merge
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnyshields committed Apr 20, 2024
1 parent a176439 commit 4e3fcc6
Show file tree
Hide file tree
Showing 17 changed files with 401 additions and 482 deletions.
15 changes: 15 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Conduct of Code

1. "I fight for the Users." - Tron

2. "Talk is cheap. Show me the code." - Linus Torvalds

3. "Everything should be made as simple as possible, but not simpler." - Albert Einstein

4. "The most dangerous phrase in the language is: We've always done it this way." - Grace Hopper

5. "A feeling of aversion or attachment toward something is your clue that there's work to be done." - Ram Dass

6. "I'm smart enough to know that I'm dumb." - Richard Feynman

7. "Be excellent to each other." - Abraham Lincoln
3 changes: 0 additions & 3 deletions docs/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,3 @@ for MongoDB in Ruby.
contributing
additional-resources
ecosystem


For documentation on Mongoid 3 and 4, see `<http://mongoid.github.io>`_.
2 changes: 1 addition & 1 deletion docs/installation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Using Mongoid with a New Rails Application

When creating a new Rails application and wish to use Mongoid for
data access, give the ``--skip-active-record`` flag to the ``rails new``
command to avoid depending on and configuring ActiveRecord..
command to avoid depending on and configuring ActiveRecord.

Using Mongoid with an Existing Rails Application
================================================
Expand Down
189 changes: 16 additions & 173 deletions docs/reference/compatibility.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,52 +34,17 @@ specified Mongoid versions.
- Driver 2.17-2.10
- Driver 2.9-2.7

* - 9.0
* - 8.0 thru 9.0
- |checkmark|
-
-

* - 8.1
* - 7.2 thru 7.5
- |checkmark|
-
-

* - 8.0
- |checkmark|
-
-

* - 7.5
- |checkmark|
- |checkmark|
-

* - 7.4
- |checkmark|
- |checkmark|
-

* - 7.3
- |checkmark|
- |checkmark|
-

* - 7.2
- |checkmark|
- |checkmark|
-

* - 7.1
- |checkmark|
- |checkmark|
- |checkmark|

* - 7.0
- |checkmark|
- |checkmark|
- |checkmark|

* - 6.4
* - 7.0 thru 7.1
- |checkmark|
- |checkmark|
- |checkmark|
Expand Down Expand Up @@ -107,9 +72,9 @@ is deprecated.
- Ruby 2.4
- Ruby 2.3
- Ruby 2.2
- JRuby 9.2
- JRuby 9.3
- JRuby 9.4
- JRuby 9.3
- JRuby 9.2

* - 9.0
- |checkmark|
Expand All @@ -121,9 +86,9 @@ is deprecated.
-
-
-
- |checkmark|
-
-
- |checkmark|

* - 8.1
- |checkmark|
Expand All @@ -139,7 +104,6 @@ is deprecated.
- |checkmark|
-


* - 8.0
-
- |checkmark|
Expand All @@ -164,9 +128,9 @@ is deprecated.
-
-
-
- D
- |checkmark|
-
- |checkmark|
- D

* - 7.4
-
Expand All @@ -178,9 +142,9 @@ is deprecated.
-
-
-
- |checkmark|
-
-
- |checkmark|

* - 7.3
-
Expand All @@ -192,9 +156,9 @@ is deprecated.
- D
- D
-
- |checkmark|
-
-
- |checkmark|

* - 7.2
-
Expand All @@ -206,9 +170,9 @@ is deprecated.
- D
- D
-
- |checkmark|
-
-
- |checkmark|

* - 7.1
-
Expand All @@ -220,9 +184,9 @@ is deprecated.
- |checkmark| [#ruby-2.4]_
- |checkmark|
-
- |checkmark|
-
-
- |checkmark|

* - 7.0
-
Expand All @@ -234,23 +198,9 @@ is deprecated.
- |checkmark| [#ruby-2.4]_
- |checkmark|
- |checkmark| [#ruby-2.2]_
- |checkmark|
-
-

* - 6.4
-
-
-
-
- |checkmark|
- |checkmark|
- |checkmark| [#ruby-2.4]_
- |checkmark|
- |checkmark| [#ruby-2.2]_
- |checkmark|
-
-

.. [#mongoid-7.3-ruby-3.0] Mongoid version 7.3.2 or higher is required.

Expand Down Expand Up @@ -296,33 +246,7 @@ and will be removed in a next version.
- MongoDB 3.0
- MongoDB 2.6

* - 9.0
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
-
-
-
-

* - 8.1
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
-
-
-
-

* - 8.0
* - 8.0 thru 9.0
- |checkmark|
- |checkmark|
- |checkmark|
Expand All @@ -335,7 +259,7 @@ and will be removed in a next version.
-
-

* - 7.5
* - 7.4 thru 7.5
- |checkmark|
- |checkmark|
- |checkmark|
Expand All @@ -348,72 +272,7 @@ and will be removed in a next version.
- D
- D

* - 7.4
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- D
- D
- D
- D

* - 7.3
-
-
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- D
- D
- D
- D

* - 7.2
-
-
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- D
- D
- D
- D

* - 7.1
-
-
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- D
- D
- D
- D

* - 7.0
-
-
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark|
- D
- D
- D
- D

* - 6.4
* - 7.0 thru 7.3
-
-
- |checkmark|
Expand Down Expand Up @@ -456,15 +315,7 @@ are supported by Mongoid.
-
-

* - 8.1
- |checkmark| [#rails-7.1]_
- |checkmark|
- |checkmark|
- |checkmark|
- |checkmark| [#rails-5-ruby-3.0]_
-

* - 8.0
* - 8.0 thru 8.1
- |checkmark| [#rails-7.1]_
- |checkmark|
- |checkmark|
Expand Down Expand Up @@ -520,14 +371,6 @@ are supported by Mongoid.
- |checkmark|
- |checkmark|

* - 6.4
-
-
-
-
- |checkmark|
- |checkmark|

.. [#rails-5-ruby-3.0] Using Rails 5.x with Ruby 3 is not supported.

.. [#rails-6] Rails 6.0 requires Mongoid 7.0.5 or later.
Expand Down
Loading

0 comments on commit 4e3fcc6

Please sign in to comment.