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.

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

Update CODE_OF_CONDUCT.md #992

Merged
merged 1 commit into from
Sep 3, 2019
Merged

Update CODE_OF_CONDUCT.md #992

merged 1 commit into from
Sep 3, 2019

Conversation

sashadev-sky
Copy link
Member

@sashadev-sky sashadev-sky commented Sep 3, 2019

Update code of conduct to reflect changes on https://publiclab.org/conduct Aug 28th, 2019

Fixes: #993

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/mapknitter-reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

Update code of conduct to reflect changes on https://publiclab.org/conduct Aug 28th, 2019
@codeclimate
Copy link

codeclimate bot commented Sep 3, 2019

Code Climate has analyzed commit ff7d8e5 and detected 0 issues on this pull request.

View more on Code Climate.

@sashadev-sky
Copy link
Member Author

@publiclab/mapknitter-reviewers

@codecov
Copy link

codecov bot commented Sep 3, 2019

Codecov Report

Merging #992 into main will increase coverage by 31.19%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##             main     #992       +/-   ##
===========================================
+ Coverage   42.06%   73.26%   +31.19%     
===========================================
  Files          40       40               
  Lines        1557     1384      -173     
===========================================
+ Hits          655     1014      +359     
+ Misses        902      370      -532
Impacted Files Coverage Δ
app/models/map.rb 93.33% <0%> (+1.33%) ⬆️
app/models/user.rb 100% <0%> (+3.57%) ⬆️
app/helpers/application_helper.rb 50% <0%> (+20.58%) ⬆️
app/controllers/application_controller.rb 88.88% <0%> (+25%) ⬆️
app/controllers/sessions_controller.rb 32.91% <0%> (+32.91%) ⬆️
app/controllers/front_ui_controller.rb 78.78% <0%> (+33.33%) ⬆️
app/controllers/maps_controller.rb 91.89% <0%> (+55.85%) ⬆️
app/controllers/annotations_controller.rb 59.25% <0%> (+59.25%) ⬆️
app/controllers/images_controller.rb 75.64% <0%> (+75.64%) ⬆️
app/controllers/tags_controller.rb 89.65% <0%> (+89.65%) ⬆️
... and 7 more

Copy link
Member

@SidharthBansal SidharthBansal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@SidharthBansal SidharthBansal merged commit dd0fa12 into main Sep 3, 2019
jywarren pushed a commit that referenced this pull request Sep 6, 2019
* Remove unwanted container_name

* Reference web container for current compose project

* Change docker for docker-compose reference

* Change initializer to factory syntax (#944)

* change to factory syntax

* fix typo

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com>

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com>

* try different syntax

* Put env var in right place

* Run instead of exec to be able to pass env vars.

* Pointer fix for Image options (#935)

* Latest pull from upstream

* Pointer changes

* Deeleted extra files

* Delete passenger.3000.pid.lock

Deleted file

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Last update to app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update _index.html.erb

* Update _index.html.erb

* Update CODE_OF_CONDUCT.md (#992)

Update code of conduct to reflect changes on https://publiclab.org/conduct Aug 28th, 2019

* Removed the dotted line from OAuth button options (#981)

* Grid-view-follow-up (#964)

* Bump bootsnap from 1.4.4 to 1.4.5 (#977)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](Shopify/bootsnap@v1.4.4...v1.4.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Setting ForeGO instead of Foreman (#995)

* Setting up ForeGO in favor of Foreman(deprecated)

* Bundle updating gems

* Bump faker from 2.1.2 to 2.2.1 (#984)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](faker-ruby/faker@v2.1.2...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* change run to exec

* run instead of exec
chen-robert pushed a commit to chen-robert/mapknitter that referenced this pull request Dec 5, 2019
Update code of conduct to reflect changes on https://publiclab.org/conduct Aug 28th, 2019
chen-robert pushed a commit to chen-robert/mapknitter that referenced this pull request Dec 5, 2019
* Remove unwanted container_name

* Reference web container for current compose project

* Change docker for docker-compose reference

* Change initializer to factory syntax (publiclab#944)

* change to factory syntax

* fix typo

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com>

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com>

* try different syntax

* Put env var in right place

* Run instead of exec to be able to pass env vars.

* Pointer fix for Image options (publiclab#935)

* Latest pull from upstream

* Pointer changes

* Deeleted extra files

* Delete passenger.3000.pid.lock

Deleted file

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Last update to app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update _index.html.erb

* Update _index.html.erb

* Update CODE_OF_CONDUCT.md (publiclab#992)

Update code of conduct to reflect changes on https://publiclab.org/conduct Aug 28th, 2019

* Removed the dotted line from OAuth button options (publiclab#981)

* Grid-view-follow-up (publiclab#964)

* Bump bootsnap from 1.4.4 to 1.4.5 (publiclab#977)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](Shopify/bootsnap@v1.4.4...v1.4.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Setting ForeGO instead of Foreman (publiclab#995)

* Setting up ForeGO in favor of Foreman(deprecated)

* Bundle updating gems

* Bump faker from 2.1.2 to 2.2.1 (publiclab#984)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](faker-ruby/faker@v2.1.2...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* change run to exec

* run instead of exec
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update code of conduct
2 participants