Skip to content

Commit 296627c

Browse files
author
Robert Mosolgo
authored
Merge branch '1.9-dev' into immutable-nodes
2 parents 00fa20a + f3dfdf6 commit 296627c

File tree

400 files changed

+20122
-3522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

400 files changed

+20122
-3522
lines changed

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ AllCops:
1010

1111
# def ...
1212
# end
13-
Lint/DefEndAlignment:
13+
Layout/DefEndAlignment:
1414
EnforcedStyleAlignWith: def
1515

1616
# value = if
1717
# # ...
1818
# end
19-
Lint/EndAlignment:
19+
Layout/EndAlignment:
2020
EnforcedStyleAlignWith: variable
2121

2222
Lint/UselessAssignment:

.travis.yml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@ node_js: "7"
99
env:
1010
global:
1111
- CODECLIMATE_REPO_TOKEN=f5b27b2e25d3f4e199bb2566fb4fd4507144a004c71d4aa33a32c2df5f940333
12-
- JRUBY_OPTS="--debug" # Coverage may be inaccurate without debug flag
1312
before_install:
1413
- gem update --system --no-doc
1514
- gem install bundler
1615

1716
rvm:
18-
- 2.1.10 # Lowest version officially supported by the gem is 2.1
17+
- 2.2.8 # Lowest version officially supported by the gem is 2.2
1918
- 2.4.3
20-
- jruby-9.1.15.0
2119

2220
services:
2321
- postgresql
22+
- mongodb
2423

2524
before_script:
2625
- psql -c 'create database graphql_ruby_test;' -U postgres
@@ -31,6 +30,7 @@ gemfile:
3130
- gemfiles/rails_4.2.gemfile
3231
- gemfiles/rails_5.0.gemfile
3332
- gemfiles/rails_5.1.gemfile
33+
- gemfiles/rails_5.2.gemfile
3434

3535

3636
matrix:
@@ -66,17 +66,9 @@ matrix:
6666
gemfile: gemfiles/rails_4.1.gemfile
6767
- rvm: 2.4.3
6868
gemfile: gemfiles/rails_4.2.gemfile
69-
- rvm: 2.1.10
70-
gemfile: gemfiles/rails_5.0.gemfile # Rails 5 requires Ruby 2.2.2+
71-
- rvm: 2.1.10
72-
gemfile: gemfiles/rails_5.1.gemfile # Rails 5 requires Ruby 2.2.2+
73-
- rvm: jruby-9.1.15.0
74-
gemfile: gemfiles/rails_3.2.gemfile # JRuby + latest Rails only
75-
- rvm: jruby-9.1.15.0
76-
gemfile: gemfiles/rails_4.0.gemfile # JRuby + latest Rails only
77-
- rvm: jruby-9.1.15.0
78-
gemfile: gemfiles/rails_4.1.gemfile # JRuby + latest Rails only
79-
- rvm: jruby-9.1.15.0
80-
gemfile: gemfiles/rails_4.2.gemfile # JRuby + latest Rails only
81-
- rvm: jruby-9.1.15.0
82-
gemfile: gemfiles/rails_5.0.gemfile # JRuby + latest Rails only
69+
- rvm: 2.2.8
70+
gemfile: gemfiles/rails_5.0.gemfile
71+
- rvm: 2.2.8
72+
gemfile: gemfiles/rails_5.1.gemfile
73+
- rvm: 2.2.8
74+
gemfile: gemfiles/rails_5.2.gemfile

Appraisals

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ appraise 'rails_5.1' do
3535
gem 'selenium-webdriver'
3636
end
3737

38+
appraise "rails_5.2" do
39+
gem 'rails', '~> 5.2.0'
40+
end
41+
3842
appraise 'without_rails' do
3943
gem "globalid"
4044
end

CHANGELOG-pro.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,58 @@
88

99
### Bug Fix
1010

11+
## 1.7.7 (10 May 2018)
12+
13+
### Bug Fix
14+
15+
- Fix ordering of authorization field instrumenter (put it at the end, not the beginning of the list)
16+
17+
## 1.7.6 (2 May 2018)
18+
19+
### New Features
20+
21+
- Authorization: Add `view`/`access`/`authorize` methods to `GraphQL::Schema::Mutation`
22+
23+
## 1.7.5 (19 Apr 2018)
24+
25+
### New Features
26+
27+
- Authorization: when a `fallback:` configuration is given, apply it to each field which doesn't have a configuration of its own or from its return type. _Don't_ apply that configuration at schema level (it's applied to each otherwise uncovered field instead).
28+
29+
## 1.7.4 (16 Apr 2018)
30+
31+
### New Features
32+
33+
- Support Mongoid::Criteria in authorization scoping
34+
35+
## 1.7.3 (12 Apr 2018)
36+
37+
### Bug Fix
38+
39+
- Fix authorization code for when `ActiveRecord` is not defined
40+
41+
## 1.7.2 (10 Apr 2018)
42+
43+
### Bug Fix
44+
45+
- Use a more permissive regexp (`/^\s*((?:[a-z._]+)\(.*\))\s*(asc|desc)?\s*$/im`) to parse SQL functions
46+
47+
## 1.7.1 (4 Apr 2018)
48+
49+
### Bug Fix
50+
51+
- Fix route helpers to support class-based schemas
52+
53+
## 1.7.0 (25 Mar 2018)
54+
55+
### New Features
56+
57+
- Support `1.8-pre` versions of GraphQL-Ruby
58+
59+
### Bug Fix
60+
61+
- Fix OperationStore when other query instrumenters need `.query_string`
62+
1163
## 1.6.5 (7 Feb 2018)
1264

1365
### Bug Fix

0 commit comments

Comments
 (0)