8000 Merge branch 'master' into master · bkdubey/scala.github.com@7979868 · GitHub
[go: up one dir, main page]

Skip to content

Commit 7979868

Browse files
authored
Merge branch 'master' into master
2 parents 3bf9124 + bf8795b commit 7979868

8 files changed

+287
-60
lines changed

CODE_OF_CONDUCT.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
## Scala Code of Conduct
2+
3+
We are committed to providing a friendly, safe and welcoming environment for
4+
all, regardless of level of experience, gender, gender identity and expression,
5+
sexual orientation, disability, personal appearance, body size, race, ethnicity,
6+
age, religion, nationality, or other such characteristics.
7+
8+
### Our Standards
9+
10+
**Whether you’re a regular contributor or a newcomer, we care about making this community a welcoming and safe place for you and we’ve got your back.**
11+
12+
As a member of the community, you agree to the following:
13+
14+
**Encouraged:**
15+
16+
- Be kind and courteous.
17+
- Respect differences of opinion and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer.
18+
- Remember that everyone was new to Scala at some point. We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Assume competence.
19+
- Show empathy towards other community members.
20+
21+
**Discouraged:**
22+
23+
- Keep unstructured critique to a minimum. We encourage sharing ideas and perspectives, so please ensure that your feedback is constructive and relevant. If you have solid ideas you want to experiment with, make a fork and see how it works.
24+
- Avoid aggressive and micro-aggressive behavior, such as unconstructive criticism, providing corrections that do not improve the conversation (sometimes referred to as "well actually"s), repeatedly interrupting or talking over someone else, feigning surprise at someone’s lack of knowledge or awareness about a topic, or subtle prejudice (for example, comments like “That’s so easy my grandmother could do it.”). For more examples of this kind of behavior, [see the Recurse Center's user manual](https://www.recurse.com/manual#sec-environment).
25+
- We will exclude you from interaction if you insult, demean or harass anyone. The term “Harassment” includes “Unacceptable Behavior” described in the [Citizen Code of Conduct](http://citizencodeofconduct.org/). **In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.**
26+
- Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member's behavior, please contact one of the [moderators](https://contributors.scala-lang.org/about) or any member of the [Scala Center](http://scala.epfl.ch/) immediately.
27+
- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
28+
29+
### Moderation
30+
31+
These are the policies for upholding our community’s standards of conduct. If
32+
you feel that a thread needs moderation, please contact anyone on the
33+
[moderation team](https://contributors.scala-lang.org/about), or any employee of
34+
the [Scala Center](https://scala.epfl.ch/).
35+
36+
- Remarks that violate the above code of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
37+
- Moderators will warn users who make remarks inconsistent with the above code of conduct.
38+
- If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off.
39+
- If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
40+
- Moderators may choose at their discretion to un-ban the user if it was a first offense and they if they make suitable amends with the offended party.
41+
- If you think a ban is unjustified, please take it up with that moderator, or with a different moderator, in private. Complaints about bans in-channel are not allowed.
42+
- Moderators are held to a higher standard than other community members. If a moderator acts inappropriately, they should expect less leeway than others.
43+
44+
In the Scala community we strive to go the extra step to look out for each
45+
other. Don’t just aim to be technically unimpeachable; try to be your best self.
46+
In particular, avoid exacerbating offensive or sensitive issues, particularly if
47+
they’re off-topic; this all too often leads to unnecessary fights, hurt
48+
feelings, and damaged trust; worse, it can drive people away from the community
49+
entirely.
50+
51+
If someone takes issue with something you said or did, resist the urge to be
52+
defensive. Rather, stop the offending behavior, apologize, and be sensitive
53+
thereafter. Even if you feel you were misinterpreted or unfairly accused,
54+
chances are good there was something you could’ve communicated better — remember
55+
that it’s your responsibility to make your fellow Scala developers comfortable.
56+
We are all here first and foremost because we want to talk about cool
57+
technology, and everyone wants to get along in doing so. People are generally
58+
eager to assume good intent and forgive.
59+
60+
### Domain
61+
62+
The enforcement policies listed above apply to all official Scala channels:
63+
mailing lists, GitHub repositories and Gitter channels under scala and
64+
scalacenter, Discourse, and Scala Center venues and hackathons. For other
65+
projects adopting the Scala Code of Conduct, please contact the maintainers of
66+
those projects for enforcement. If you wish to use this code of conduct for your
67+
own project, consider explicitly mentioning your moderation policy or making a
68+
copy with your own moderation policy so as to avoid confusion.
69+
70+
### Credits
71+
72+
Adapted from and/or inspired by multiple successful Codes of Conduct, including:
73+
74+
* [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html)
75+
* [The Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)
76+
* [The Contributor Covenant v1.4.0](http://contributor-covenant.org/version/1/4/)
77+
* [The Recurse Center's User Manual](https://www.recurse.com/manual#sec-environment)
78+
* [The 18F Code of Conduct](https://18f.gsa.gov/code-of-conduct/)

Gemfile.lock

Lines changed: 113 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,79 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.7)
4+
activesupport (4.2.8)
55
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
76
minitest (~> 5.1)
87
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
10-
addressable (2.4.0)
9+
addressable (2.5.1)
10+
public_suffix (~> 2.0, >= 2.0.2)
1111
coffee-script (2.4.1)
1212
coffee-script-source
1313
execjs
14-
coffee-script-source (1.10.0)
14+
coffee-script-source (1.12.2)
1515
colorator (1.1.0)
16-
ethon (0.9.1)
16+
ethon (0.10.1)
1717
ffi (>= 1.3.0)
1818
execjs (2.7.0)
19-
faraday (0.9.2)
19+
faraday (0.12.1)
2020
multipart-post (>= 1.2, < 3)
21-
ffi (1.9.14)
21+
ffi (1.9.18)
2222
forwardable-extended (2.6.0)
23-
gemoji (2.1.0)
24-
github-pages (104)
25-
activesupport (= 4.2.7)
26-
github-pages-health-check (= 1.2.0)
27-
jekyll (= 3.3.0)
23+
gemoji (3.0.0)
24+
github-pages (143)
25+
activesupport (= 4.2.8)
26+
github-pages-health-check (= 1.3.4)
27+
jekyll (= 3.4.5)
2828
jekyll-avatar (= 0.4.2)
2929
jekyll-coffeescript (= 1.0.1)
30-
jekyll-feed (= 0.8.0)
30+
jekyll-default-layout (= 0.1.4)
31+
jekyll-feed (= 0.9.2)
3132
jekyll-gist (= 1.4.0)
32-
jekyll-github-metadata (= 2.2.0)
33+
jekyll-github-metadata (= 2.4.0)
3334
jekyll-mentions (= 1.2.0)
35+
jekyll-optional-front-matter (= 0.1.2)
3436
jekyll-paginate (= 1.1.0)
35-
jekyll-redirect-from (= 0.11.0)
36-
jekyll-sass-converter (= 1.3.0)
37-
jekyll-seo-tag (= 2.1.0)
38-
jekyll-sitemap (= 0.12.0)
37+
jekyll-readme-index (= 0.1.0)
38+
jekyll-redirect-from (= 0.12.1)
39+
jekyll-relative-links (= 0.4.1)
40+
jekyll-sass-converter (= 1.5.0)
41+
jekyll-seo-tag (= 2.2.3)
42+
jekyll-sitemap (= 1.0.0)
3943
jekyll-swiss (= 0.4.0)
40-
jemoji (= 0.7.0)
41-
kramdown (= 1.11.1)
44+
jekyll-theme-architect (= 0.0.4)
45+
jekyll-theme-cayman (= 0.0.4)
46+
jekyll-theme-dinky (= 0.0.4)
47+
jekyll-theme-hacker (= 0.0.4)
48+
jekyll-theme-leap-day (= 0.0.4)
49+
jekyll-theme-merlot (= 0.0.4)
50+
jekyll-theme-midnight (= 0.0.4)
51+
jekyll-theme-minimal (= 0.0.4)
52+
jekyll-theme-modernist (= 0.0.4)
53+
jekyll-theme-primer (= 0.3.0)
54+
jekyll-theme-slate (= 0.0.4)
55+
jekyll-theme-tactile (= 0.0.4)
56+
jekyll-theme-time-machine (= 0.0.4)
57+
jekyll-titles-from-headings (= 0.2.0)
58+
jemoji (= 0.8.0)
59+
kramdown (= 1.13.2)
4260
liquid (= 3.0.6)
4361
listen (= 3.0.6)
4462
mercenary (~> 0.3)
45-
minima (= 2.0.0)
63+
minima (= 2.1.1)
4664
rouge (= 1.11.1)
4765
terminal-table (~> 1.4)
48-
github-pages-health-check (1.2.0)
66+
github-pages-health-check (1.3.4)
4967
addressable (~> 2.3)
5068
net-dns (~> 0.8)
5169
octokit (~> 4.0)
52-
public_suffix (~> 1.4)
70+
public_suffix (~> 2.0)
5371
typhoeus (~> 0.7)
54-
html-pipeline (2.4.2)
72+
html-pipeline (2.6.0)
5573
activesupport (>= 2)
5674
nokogiri (>= 1.4)
57-
i18n (0.7.0)
58-
jekyll (3.3.0)
75+
i18n (0.8.6)
76+
jekyll (3.4.5)
5977
addressable (~> 2.4)
6078
colorator (~> 1.0)
6179
jekyll-sass-converter (~> 1.0)
@@ -70,32 +88,68 @@ GEM
7088
jekyll (~> 3.0)
7189
jekyll-coffeescript (1.0.1)
7290
coffee-script (~> 2.2)
73-
jekyll-feed (0.8.0)
91+
jekyll-default-layout (0.1.4)
92+
jekyll (~> 3.0)
93+
jekyll-feed (0.9.2)
7494
jekyll (~> 3.3)
7595
jekyll-gist (1.4.0)
7696
octokit (~> 4.2)
77-
jekyll-github-metadata (2.2.0)
97+
jekyll-github-metadata (2.4.0)
7898
jekyll (~> 3.1)
7999
octokit (~> 4.0, != 4.4.0)
80100
jekyll-mentions (1.2.0)
81101
activesupport (~> 4.0)
82102
html-pipeline (~> 2.3)
83103
jekyll (~> 3.0)
104+
jekyll-optional-front-matter (0.1.2)
105+
jekyll (~> 3.0)
84106
jekyll-paginate (1.1.0)
85-
jekyll-redirect-from (0.11.0)
86-
jekyll (>= 2.0)
87-
jekyll-sass-converter (1.3.0)
88-
sass (~> 3.2)
89-
jekyll-seo-tag (2.1.0)
107+
jekyll-readme-index (0.1.0)
108+
jekyll (~> 3.0)
109+
jekyll-redirect-from (0.12.1)
110+
jekyll (~> 3.3)
111+
jekyll-relative-links (0.4.1)
112+
jekyll (~> 3.3)
113+
jekyll-sass-converter (1.5.0)
114+
sass (~> 3.4)
115+
jekyll-seo-tag (2.2.3)
90116
jekyll (~> 3.3)
91-
jekyll-sitemap (0.12.0)
117+
jekyll-sitemap (1.0.0)
92118
jekyll (~> 3.3)
93119
jekyll-swiss (0.4.0)
120+
jekyll-theme-architect (0.0.4)
121+
jekyll (~> 3.3)
122+
jekyll-theme-cayman (0.0.4)
123+
jekyll (~> 3.3)
124+
jekyll-theme-dinky (0.0.4)
125+
jekyll (~> 3.3)
126+
jekyll-theme-hacker (0.0.4)
127+
jekyll (~> 3.3)
128+
jekyll-theme-leap-day (0.0.4)
129+
jekyll (~> 3.3)
130+
jekyll-theme-merlot (0.0.4)
131+
jekyll (~> 3.3)
132+
jekyll-theme-midnight (0.0.4)
133+
jekyll (~> 3.3)
134+
jekyll-theme-minimal (0.0.4)
135+
jekyll (~> 3.3)
136+
jekyll-theme-modernist (0.0.4)
137+
jekyll (~> 3.3)
138+
jekyll-theme-primer (0.3.0)
139+
jekyll (~> 3.3)
140+
jekyll-theme-slate (0.0.4)
141+
jekyll (~> 3.3)
142+
jekyll-theme-tactile (0.0.4)
143+
jekyll (~> 3.3)
144+
jekyll-theme-time-machine (0.0.4)
145+
jekyll (~> 3.3)
146+
jekyll-titles-from-headings (0.2.0)
147+
jekyll (~> 3.3)
94148
jekyll-watch (1.5.0)
95149
listen (~> 3.0, < 3.1)
96-
jemoji (0.7.0)
150+
jemoji (0.8.0)
97151
activesupport (~> 4.0)
98-
gemoji (~> 2.0)
152+
gemoji (~> 3.0)
99153
html-pipeline (~> 2.2)
100154
jekyll (>= 3.0)
101155
json (1.8.6)
@@ -106,34 +160,39 @@ GEM
106160
rb-inotify (>= 0.9.7)
107161
mercenary (0.3.6)
108162
mini_portile2 (2.1.0)
109-
minima (2.0.0)
110-
minitest (5.9.1)
163+
minima (2.1.1)
164+
jekyll (~> 3.3)
165+
minitest (5.10.2)
111166
multipart-post (2.0.0)
112167
net-dns (0.8.0)
113168
nokogiri (1.6.8.1)
114169
mini_portile2 (~> 2.1.0)
115-
octokit (4.4.1)
116-
sawyer (~> 0.7.0, >= 0.5.3)
170+
octokit (4.7.0)
171+
sawyer (~> 0.8.0, >= 0.5.3)
117172
pathutil (0.14.0)
118173
forwardable-extended (~> 2.6)
119-
public_suffix (1.5.3)
120-
rb-fsevent (0.9.8)
121-
rb-inotify (0.9.7)
122-
ffi (>= 0.5.0)
174+
public_suffix (2.0.5)
175+
rb-fsevent (0.10.2)
176+
rb-inotify (0.9.10)
177+
ffi (>= 0.5.0, < 2)
123178
rouge (1.11.1)
124179
safe_yaml (1.0.4)
125-
sass (3.4.22)
126-
sawyer (0.7.0)
127-
addressable (>= 2.3.5, < 2.5)
128-
faraday (~> 0.8, < 0.10)
129-
terminal-table (1.7.3)
130-
unicode-display_width (~> 1.1.1)
131-
thread_safe (0.3.5)
180+
sass (3.5.1)
181+
sass-listen (~> 4.0.0)
182+
sass-listen (4.0.0)
183+
rb-fsevent (~> 0.9, >= 0.9.4)
184+
rb-inotify (~> 0.9, >= 0.9.7)
185+
sawyer (0.8.1)
186+
addressable (>= 2.3.5, < 2.6)
187+
faraday (~> 0.8, < 1.0)
188+
terminal-table (1.8.0)
189+
unicode-display_width (~> 1.1, >= 1.1.1)
190+
thread_safe (0.3.6)
132191
typhoeus (0.8.0)
133192
ethon (>= 0.8.0)
134-
tzinfo (1.2.2)
193+
tzinfo (1.2.3)
135194
thread_safe (~> 0.1)
136-
unicode-display_width (1.1.1)
195+
unicode-display_width (1.3.0)
137196

138197
PLATFORMS
139198
ruby
@@ -143,4 +202,4 @@ DEPENDENCIES
143202
jekyll-redirect-from
144203

145204
BUNDLED WITH
146-
1.14.6
205+
1.15.1

conduct.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<body>
77
<h2>Redirecting you to the Scala Code of Conduct...</h2>
88
<script type="text/javascript">
9-
window.location.replace('http://scala-lang.org/conduct.html');
9+
window.location.replace('http://scala-lang.org/conduct/');
1010
</script>
1111
</body>

0 commit comments

Comments
 (0)
0