diff --git a/.all-contributorsrc b/.all-contributorsrc deleted file mode 100644 index 6b4c9522..00000000 --- a/.all-contributorsrc +++ /dev/null @@ -1,175 +0,0 @@ -{ - "projectName": "retrospring", - "projectOwner": "Retrospring", - "repoType": "github", - "repoHost": "https://github.com", - "files": [ - "README.md" - ], - "imageSize": 100, - "commit": true, - "commitConvention": "none", - "types": { - "ios": { - "symbol": "📱", - "description": "Worked on an iOS app.", - "link": "[<%= symbol %>](https://github.com/Retrospring/retrospring-ios)," - }, - "blend": { - "symbol": "🖥", - "description": "Worked on an Windows UWP/Blend app.", - "link": "[<%= symbol %>](https://github.com/Retrospring/retrospring-blend)," - } - }, - "contributors": [ - { - "login": "nilsding", - "name": "Georg Gadinger", - "avatar_url": "https://avatars0.githubusercontent.com/u/1809170?v=4", - "profile": "https://nilsding.org", - "contributions": [ - "maintenance", - "code", - "test", - "infra", - "bug", - "review" - ] - }, - { - "login": "pixeldesu", - "name": "Andreas Nedbal", - "avatar_url": "https://avatars2.githubusercontent.com/u/1774242?v=4", - "profile": "https://pixelde.su", - "contributions": [ - "maintenance", - "code", - "design", - "test", - "bug", - "review", - "ideas", - "translation", - "content" - ] - }, - { - "login": "healingbrew", - "name": "Naomi Ahmed", - "avatar_url": "https://avatars2.githubusercontent.com/u/614231?v=4", - "profile": "http://chomp.gg/", - "contributions": [ - "code", - "design", - "bug", - "ideas", - "translation" - ] - }, - { - "login": "mltnhm", - "name": "mltnhm", - "avatar_url": "https://avatars3.githubusercontent.com/u/6197148?v=4", - "profile": "https://kjk.dog", - "contributions": [ - "code", - "infra", - "bug", - "ideas", - "review" - ] - }, - { - "login": "corsair", - "name": "Tyler Corsair", - "avatar_url": "https://avatars1.githubusercontent.com/u/1847891?v=4", - "profile": "http://tylercorsair.com/", - "contributions": [ - "content" - ] - }, - { - "login": "DasGraMMa", - "name": "Marcel", - "avatar_url": "https://avatars1.githubusercontent.com/u/5408476?v=4", - "profile": "https://www.gramma.name/", - "contributions": [ - "blend" - ] - }, - { - "login": "liclac", - "name": "embr", - "avatar_url": "https://avatars1.githubusercontent.com/u/428026?v=4", - "profile": "https://twitter.com/_liclac", - "contributions": [ - "ios" - ] - }, - { - "login": "coderobe", - "name": "Robin B.", - "avatar_url": "https://avatars1.githubusercontent.com/u/8442384?v=4", - "profile": "https://coderobe.net/", - "contributions": [ - "code" - ] - }, - { - "login": "colons", - "name": "colons", - "avatar_url": "https://avatars2.githubusercontent.com/u/1394710?v=4", - "profile": "https://colons.co", - "contributions": [ - "code" - ] - }, - { - "login": "skielred", - "name": "Tina", - "avatar_url": "https://avatars2.githubusercontent.com/u/9400466?v=4", - "profile": "https://tina.moe", - "contributions": [ - "content" - ] - }, - { - "login": "thehowl", - "name": "Morgan", - "avatar_url": "https://avatars0.githubusercontent.com/u/4681308?v=4", - "profile": "https://zxq.co/howl", - "contributions": [ - "content", - "translation" - ] - }, - { - "login": "tmprnc", - "name": "temperance", - "avatar_url": "https://avatars3.githubusercontent.com/u/3785923?v=4", - "profile": "https://twitter.com/tmprnz", - "contributions": [ - "translation" - ] - }, - { - "login": "Filippus", - "name": "Vilppu P.", - "avatar_url": "https://avatars2.githubusercontent.com/u/11085847?v=4", - "profile": "https://github.com/Filippus", - "contributions": [ - "translation" - ] - }, - { - "login": "tupsut", - "name": "Saskia", - "avatar_url": "https://avatars0.githubusercontent.com/u/6755916?v=4", - "profile": "https://tupsu.tuuba.moe/", - "contributions": [ - "translation" - ] - } - ], - "contributorsPerLine": 7 -} diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 7ee0bfac..45d4f725 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,34 +6,27 @@ development of Retrospring. ## Reporting bugs Before submitting an issue please check if there is already an existing issue. -If there is, please add any additional information or give it a "+1" in the -comments. +If there is, please add any additional information or give it a 👍 reaction. When submitting an issue please describe the issue clearly, including how to reproduce the bug, which situations it appears in, what you expect to happen, what actually happens, and what platform (browser and operating system) you are -using. We find screenshots (for front-end issues) very helpful. +using. We find screenshots (for front-end issues) very helpful. ## Pull Requests -1. Fork it ( https://github.com/Retrospring/retrospring/fork ) -2. Create your feature branch (`git checkout -b feature-new`) +1. Fork it (https://github.com/Retrospring/retrospring/fork) +2. Create your feature branch (`git checkout -b feature/new`) 3. Commit your changes (`git commit -am 'Add some feature'`) -4. Push to the branch (`git push origin feature-new`) +4. Push to the branch (`git push origin feature/new`) 5. Create a new Pull Request We love pull requests! We are very happy to work with you to get your changes merged in, however please keep the following in mind. -* Please use the core team standard of `feature-*` branch naming. +* Please use the core team standard of `feature/*` or `fix/*` branch naming. * Adhere to the coding conventions you see in the surrounding code. * If you include a new feature also include tests, and make sure they'll pass. * Before submitting a pull-request, clean up the history by going over your commits and squashing together minor changes and fixes into the corresponding - commits. You can do this using the interactive rebase command. - -## What to work on - -If you want to know what you can help us with, like new features, check the -GitHub issues or the -[TODO](https://github.com/Retrospring/retrospring/blob/master/TODO). + commits. You can do this using the [interactive rebase](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#_changing_multiple) command. diff --git a/Gemfile b/Gemfile index 5cf0584a..71dfc6bd 100644 --- a/Gemfile +++ b/Gemfile @@ -72,22 +72,18 @@ gem "jwt", "~> 2.5" group :development do gem "binding_of_caller" - gem "byebug" gem "spring", "~> 4.1" - gem "web-console", "~> 4.0" end gem "puma" group :development, :test do gem "better_errors" - gem "brakeman" gem "bullet" gem "capybara" gem "database_cleaner" gem "factory_bot_rails", require: false gem "faker" - gem "guard-brakeman" gem "haml_lint", require: false gem "letter_opener" # Use this just in local test environments gem "poltergeist" diff --git a/Gemfile.lock b/Gemfile.lock index 3fd618bb..d7341269 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,7 +83,6 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindex (0.8.1) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) bootsnap (1.13.0) @@ -91,13 +90,11 @@ GEM bootstrap_form (4.5.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (5.3.1) buftok (0.2.0) builder (3.2.4) bullet (7.0.3) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - byebug (11.1.3) capybara (3.37.1) addressable matrix @@ -199,20 +196,6 @@ GEM glob (0.3.1) globalid (1.0.0) activesupport (>= 5.0) - guard (2.18.0) - formatador (>= 0.2.4) - listen (>= 2.7, < 4.0) - lumberjack (>= 1.0.12, < 2.0) - nenv (~> 0.1) - notiffany (~> 0.0) - pry (>= 0.13.0) - shellany (~> 0.0) - thor (>= 0.18.1) - guard-brakeman (0.8.6) - brakeman (>= 2.1.1) - guard (>= 2.0.0) - guard-compat (~> 1.0) - guard-compat (1.2.1) haml (6.0.8) temple (>= 0.8.2) thor @@ -270,9 +253,6 @@ GEM addressable (~> 2.7) letter_opener (1.8.1) launchy (>= 2.2, < 3) - listen (3.7.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) lograge (0.12.0) actionpack (>= 4) activesupport (>= 4) @@ -281,7 +261,6 @@ GEM loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.2.8) mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) @@ -304,7 +283,6 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) naught (1.1.0) - nenv (0.3.0) nested_form (0.3.2) net-imap (0.3.1) net-protocol @@ -318,9 +296,6 @@ GEM nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) - notiffany (0.1.3) - nenv (~> 0.1) - shellany (~> 0.0) oauth (0.5.8) oj (3.13.21) omniauth (2.1.0) @@ -347,9 +322,6 @@ GEM capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - pry (0.14.1) - coderay (~> 1.1) - method_source (~> 1.0) public_suffix (4.0.7) puma (6.0.0) nio4r (~> 2.0) @@ -403,9 +375,6 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) - rb-fsevent (0.11.0) - rb-inotify (0.10.1) - ffi (~> 1.0) redcarpet (3.5.1) redis (4.5.1) regexp_parser (2.6.0) @@ -483,7 +452,6 @@ GEM sentry-sidekiq (5.5.0) sentry-ruby (~> 5.5.0) sidekiq (>= 3.0) - shellany (0.0.1) shoulda-matchers (5.2.0) activesupport (>= 5.2.0) sidekiq (5.2.10) @@ -548,11 +516,6 @@ GEM uniform_notifier (1.16.0) warden (1.2.9) rack (>= 2.0.9) - web-console (4.2.0) - actionview (>= 6.0.0) - activemodel (>= 6.0.0) - bindex (>= 0.4.0) - railties (>= 6.0.0) webpacker (5.4.3) activesupport (>= 5.2) rack-proxy (>= 0.6.1) @@ -575,9 +538,7 @@ DEPENDENCIES binding_of_caller bootsnap bootstrap_form (~> 4.5) - brakeman bullet - byebug capybara carrierwave (~> 2.0) carrierwave_backgrounder! @@ -594,7 +555,6 @@ DEPENDENCIES fog-aws fog-core fog-local - guard-brakeman haml (~> 6.0) haml_lint hcaptcha (~> 7.0) @@ -648,7 +608,6 @@ DEPENDENCIES turbo-rails twitter twitter-text - web-console (~> 4.0) webpacker (~> 5.2) BUNDLED WITH diff --git a/Guardfile b/Guardfile deleted file mode 100644 index 84ce27ce..00000000 --- a/Guardfile +++ /dev/null @@ -1,23 +0,0 @@ -# A sample Guardfile -# More info at https://github.com/guard/guard#readme - -## Uncomment and set this to only include directories you want to watch -# directories %w(app lib config test spec features) \ -# .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")} - -## Note: if you are using the `directories` clause above and you are not -## watching the project directory ('.'), then you will want to move -## the Guardfile to a watched dir and symlink it back, e.g. -# -# $ mkdir config -# $ mv Guardfile config/ -# $ ln -s config/Guardfile . -# -# and, you'll have to watch "config/Guardfile" instead of "Guardfile" - -guard 'brakeman', :run_on_start => true do - watch(%r{^app/.+\.(erb|haml|rhtml|rb)$}) - watch(%r{^config/.+\.rb$}) - watch(%r{^lib/.+\.rb$}) - watch('Gemfile') -end diff --git a/README.md b/README.md index 1d861773..8b44d2aa 100644 --- a/README.md +++ b/README.md @@ -6,56 +6,36 @@ ![Retrospring](https://github.com/Retrospring/retrospring/workflows/Retrospring/badge.svg) -This is the source code that powers Retrospring. This is a detached fork of -[nilsding/justask](https://github.com/nilsding/justask), where we continue -development. +Retrospring is a **free, open-source social network** following the Q/A (question and answer) principle of sites like +Formspring, ask.fm or CuriousCat. Users can create accounts on Retrospring to receive questions from other users of the site +and/or anonymous people on the Internet. They can also follow each other on Retrospring to see new answers of their friends in +the timeline and to ask their followers interesting questions. ## Installation You can find all the installation instructions needed for a local/production -setup of Retrospring in the -[Wiki](https://github.com/Retrospring/retrospring/wiki/Setup). +setup of Retrospring in the [Wiki](https://github.com/Retrospring/retrospring/wiki/Setup). ## Contributing -Guidelines for Pull Requests and general information about how you can help us -improving Retrospring can be found -[here](https://github.com/Retrospring/retrospring/blob/master/.github/CONTRIBUTING.md). +Retrospring is **free, open-source software** licensed under **AGPLv3**. -## Contributors ✨ +Our guidelines and general information about how you can help us +improving Retrospring can be found in the [CONTRIBUTING.md](https://github.com/Retrospring/retrospring/blob/master/.github/CONTRIBUTING.md) file. -Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): +## Licence - - - - - - - - - - - - - - - - - - - - - - -

Georg Gadinger
🚧 💻 ⚠️ 🚇 🐛 👀
Andreas Nedbal
🚧 💻 🎨 ⚠️ 🐛 👀 🤔 🌍 🖋
Naomi Ahmed
💻 🎨 🐛 🤔 🌍
mltnhm
💻 🚇 🐛 🤔 👀
Tyler Corsair
🖋
Marcel
🖥
embr
📱

Robin B.
💻
colons
💻
Tina
🖋
Morgan
🖋 🌍
temperance
🌍
Vilppu P.
🌍
Saskia
🌍
+Copyright (C) 2014-2022 The Retrospring team and contributors - - - +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -## License - -[AGPLv3](https://github.com/Retrospring/retrospring/blob/master/LICENSE). +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see http://www.gnu.org/licenses/. diff --git a/Rakefile b/Rakefile index fe861b87..e951d294 100644 --- a/Rakefile +++ b/Rakefile @@ -5,10 +5,6 @@ require File.expand_path('../config/application', __FILE__) Rails.application.load_tasks -task :default do - Brakeman.run :app_path => ".", :print_report => true -end - namespace :justask do desc "Upload to AWS" task paperclaws: :environment do