From aa12d12c0be4821928f68338558964fdad35ff4c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 19 Jul 2021 11:25:44 -0400 Subject: [PATCH] discourse/discourse change from 'master' to 'main': update fixture data --- .../tests/fixtures/search-fixtures.js | 6 +- .../githubfolder-discourse-root.response | 120 +++++++++--------- spec/fixtures/onebox/githubfolder.response | 68 +++++----- .../engine/github_folder_onebox_spec.rb | 6 +- 4 files changed, 100 insertions(+), 100 deletions(-) diff --git a/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js index 0ece7ac6305..84e74240464 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js @@ -159,7 +159,7 @@ export default { uploaded_avatar_id: 3281, created_at: "2014-04-12T22:22:07.930Z", cooked: - '

So you want to set up Discourse on Ubuntu to hack on and develop with?

\n\n

We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Ubuntu system. Let\'s begin!

\n\n

Although this guide assumes that you are using Ubuntu, but the set-up instructions will work fine for any Debian based distribution.

\n\n

(If you want to install Discourse for production use, see our install guide)

\n\n

Install Discourse Dependencies

\n\n

Run this script in terminal, to setup Rails development environment:

\n\n
bash <(wget -qO- https://raw.githubusercontent.com/techAPJ/install-rails/master/linux)
\n\n

\nlinux_script.png770x211 9.62 KB\n

\n\n

This will install following new packages on your system:

\n\n\n\n

Install Phantomjs:

\n\n

For 32 bit machine:

\n\n
cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-i686.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-i686.tar.bz2\nsudo rm phantomjs-1.9.8-linux-i686.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-i686/bin/phantomjs /usr/local/bin/phantomjs\ncd
\n\n

For 64 bit machine:

\n\n
cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo rm phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs\ncd
\n\n

\nphantomjs.png969x171 10.1 KB\n

\n\n

In case you have any of this package pre-installed and don\'t want to run entire script, see the script and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.

\n\n

Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.

\n\n

Clone Discourse

\n\n

Clone the Discourse repository in ~/discourse folder:

\n\n
git clone https://github.com/discourse/discourse.git ~/discourse
\n\n

\ngit_clone.png967x137 7.73 KB\n

\n\n

Setup Database

\n\n

Open psql prompt as postgre user

\n\n
sudo -u postgres psql postgres
\n\n

\npg.png725x187 5.79 KB\n

\n\n

Create role with the same name as your ubuntu system username with discourse as password:

\n\n
CREATE ROLE discourse WITH LOGIN ENCRYPTED PASSWORD \'discourse\' CREATEDB SUPERUSER;
\n\n

In the above command, I named the role as discourse, this means that my ubuntu system username is discourse. (It is necessary for role name to be same as system username, otherwise migrations will not run)

\n\n

Check that you have successfully created discourse role:

\n\n
\\du
\n\n

\npg_user.png725x185 7.5 KB\n

\n\n

Create discourse_development and discourse_test database:

\n\n
CREATE DATABASE discourse_development WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;
\n\n

\npg_db.png724x143 6.82 KB\n

\n\n

Exit psql prompt by pressing ctrld

\n\n

Now access psql prompt in discourse_development database as discourse user:

\n\n
psql -d discourse_development -U discourse -h localhost
\n\n

When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is discourse

\n\n

Run following commands, separately:

\n\n
CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;
\n\n

\npg_dev.png726x316 13.4 KB\n

\n\n

Exit psql prompt by pressing ctrld

\n\n

Now access psql prompt in discourse_test database as discourse user:

\n\n
psql -d discourse_test -U discourse -h localhost
\n\n

When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is discourse

\n\n

Run following commands, separately:

\n\n
CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;
\n\n

\npg_test.png726x318 12.9 KB\n

\n\n

Exit psql prompt by pressing ctrld

\n\n

You have set-up the database successfully!

\n\n

Bootstrap Discourse

\n\n

Switch to your Discourse folder:

\n\n
cd ~/discourse
\n\n

Install the needed gems

\n\n
bundle install
\n\n

\nbundle.png724x248 9.75 KB\n

\n\n

Now that you have successfully configured database connection, run this command:

\n\n
bundle exec rake db:migrate db:test:prepare db:seed_fu
\n\n

Now, try running the specs:

\n\n
bundle exec rake autospec
\n\n

\nspecs.png717x263 8.63 KB\n

\n\n

Start rails server:

\n\n
bundle exec rails server
\n\n

\nserver.png724x229 10.8 KB\n

\n\n

You should now be able to connect to discourse app on http://localhost:3000 - try it out!

\n\n

\ndiscourse_start.png1919x525 20.3 KB\n

\n\n

Configure Mail and Create New Account

\n\n

We will use MailCatcher to serve emails in development environment. Install and run MailCatcher:

\n\n
gem install mailcatcher\nmailcatcher --http-ip 0.0.0.0
\n\n

Create new account:

\n\n

\ncreate_account.png720x401 13.5 KB\n

\n\n

Check confirmation email by going to MailCatcher web interface at http://localhost:1080/

\n\n

\nmc_sign_up_email.png1919x480 21.5 KB\n

\n\n

If you did not receive the email, try running this in console: bundle exec sidekiq -q default

\n\n

Click the confirmation link and your account will be activated!

\n\n

\ndisc_normal_acc.png1919x430 21.8 KB\n

\n\n

Access Admin

\n\n

Now, to make your account as admin, run the following commands in rails console:

\n\n
RAILS_ENV=development bundle exec rails c\nu = User.last\nu.admin = true\nu.save
\n\n

\nadmin_console.png722x462 31.7 KB\n

\n\n

Once you execute the above commands successfully, check out your Discourse account again:

\n\n

\nadmin_success.png1919x1032 30.3 KB\n

\n\n

Congratulations! You are now the admin of your own Discourse installation!

\n\n

Happy hacking!

\n\n

If anything needs to be improved in this guide, feel free to ask on meta.discourse.org, or even better, submit a pull request.

', + '

So you want to set up Discourse on Ubuntu to hack on and develop with?

\n\n

We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Ubuntu system. Let\'s begin!

\n\n

Although this guide assumes that you are using Ubuntu, but the set-up instructions will work fine for any Debian based distribution.

\n\n

(If you want to install Discourse for production use, see our install guide)

\n\n

Install Discourse Dependencies

\n\n

Run this script in terminal, to setup Rails development environment:

\n\n
bash <(wget -qO- https://raw.githubusercontent.com/techAPJ/install-rails/master/linux)
\n\n

\nlinux_script.png770x211 9.62 KB\n

\n\n

This will install following new packages on your system:

\n\n\n\n

Install Phantomjs:

\n\n

For 32 bit machine:

\n\n
cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-i686.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-i686.tar.bz2\nsudo rm phantomjs-1.9.8-linux-i686.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-i686/bin/phantomjs /usr/local/bin/phantomjs\ncd
\n\n

For 64 bit machine:

\n\n
cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo rm phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs\ncd
\n\n

\nphantomjs.png969x171 10.1 KB\n

\n\n

In case you have any of this package pre-installed and don\'t want to run entire script, see the script and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.

\n\n

Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.

\n\n

Clone Discourse

\n\n

Clone the Discourse repository in ~/discourse folder:

\n\n
git clone https://github.com/discourse/discourse.git ~/discourse
\n\n

\ngit_clone.png967x137 7.73 KB\n

\n\n

Setup Database

\n\n

Open psql prompt as postgre user

\n\n
sudo -u postgres psql postgres
\n\n

\npg.png725x187 5.79 KB\n

\n\n

Create role with the same name as your ubuntu system username with discourse as password:

\n\n
CREATE ROLE discourse WITH LOGIN ENCRYPTED PASSWORD \'discourse\' CREATEDB SUPERUSER;
\n\n

In the above command, I named the role as discourse, this means that my ubuntu system username is discourse. (It is necessary for role name to be same as system username, otherwise migrations will not run)

\n\n

Check that you have successfully created discourse role:

\n\n
\\du
\n\n

\npg_user.png725x185 7.5 KB\n

\n\n

Create discourse_development and discourse_test database:

\n\n
CREATE DATABASE discourse_development WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;
\n\n

\npg_db.png724x143 6.82 KB\n

\n\n

Exit psql prompt by pressing ctrld

\n\n

Now access psql prompt in discourse_development database as discourse user:

\n\n
psql -d discourse_development -U discourse -h localhost
\n\n

When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is discourse

\n\n

Run following commands, separately:

\n\n
CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;
\n\n

\npg_dev.png726x316 13.4 KB\n

\n\n

Exit psql prompt by pressing ctrld

\n\n

Now access psql prompt in discourse_test database as discourse user:

\n\n
psql -d discourse_test -U discourse -h localhost
\n\n

When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is discourse

\n\n

Run following commands, separately:

\n\n
CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;
\n\n

\npg_test.png726x318 12.9 KB\n

\n\n

Exit psql prompt by pressing ctrld

\n\n

You have set-up the database successfully!

\n\n

Bootstrap Discourse

\n\n

Switch to your Discourse folder:

\n\n
cd ~/discourse
\n\n

Install the needed gems

\n\n
bundle install
\n\n

\nbundle.png724x248 9.75 KB\n

\n\n

Now that you have successfully configured database connection, run this command:

\n\n
bundle exec rake db:migrate db:test:prepare db:seed_fu
\n\n

Now, try running the specs:

\n\n
bundle exec rake autospec
\n\n

\nspecs.png717x263 8.63 KB\n

\n\n

Start rails server:

\n\n
bundle exec rails server
\n\n

\nserver.png724x229 10.8 KB\n

\n\n

You should now be able to connect to discourse app on http://localhost:3000 - try it out!

\n\n

\ndiscourse_start.png1919x525 20.3 KB\n

\n\n

Configure Mail and Create New Account

\n\n

We will use MailCatcher to serve emails in development environment. Install and run MailCatcher:

\n\n
gem install mailcatcher\nmailcatcher --http-ip 0.0.0.0
\n\n

Create new account:

\n\n

\ncreate_account.png720x401 13.5 KB\n

\n\n

Check confirmation email by going to MailCatcher web interface at http://localhost:1080/

\n\n

\nmc_sign_up_email.png1919x480 21.5 KB\n

\n\n

If you did not receive the email, try running this in console: bundle exec sidekiq -q default

\n\n

Click the confirmation link and your account will be activated!

\n\n

\ndisc_normal_acc.png1919x430 21.8 KB\n

\n\n

Access Admin

\n\n

Now, to make your account as admin, run the following commands in rails console:

\n\n
RAILS_ENV=development bundle exec rails c\nu = User.last\nu.admin = true\nu.save
\n\n

\nadmin_console.png722x462 31.7 KB\n

\n\n

Once you execute the above commands successfully, check out your Discourse account again:

\n\n

\nadmin_success.png1919x1032 30.3 KB\n

\n\n

Congratulations! You are now the admin of your own Discourse installation!

\n\n

Happy hacking!

\n\n

If anything needs to be improved in this guide, feel free to ask on meta.discourse.org, or even better, submit a pull request.

', post_number: 1, post_type: 1, updated_at: "2015-06-22T17:24:20.607Z", @@ -249,7 +249,7 @@ export default { uploaded_avatar_id: 3281, created_at: "2014-05-19T16:59:51.082Z", cooked: - '

So you want to set up Discourse on Mac OS X to hack on and develop with?

\n\n

We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Mac. Let\'s begin!

\n\n

(If you want to install Discourse for production use, see our install guide)

\n\n

Install Discourse Dependencies

\n\n

Run this script in terminal, to setup Rails development environment:

\n\n
bash <(curl -s https://raw.githubusercontent.com/techAPJ/install-rails/master/mac)
\n\n

This script will install following new packages on your system:

\n\n\n\n

In case you have any of this package pre-installed and don\'t want to run entire script, see the script and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.

\n\n

Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.

\n\n

Clone Discourse

\n\n

Clone the Discourse repository in ~/discourse folder:

\n\n
git clone https://github.com/discourse/discourse.git ~/discourse
\n\n

\n\n

~ indicates home folder, so Discourse source code will be available in your home folder.

\n\n

Setup Database

\n\n

Open psql prompt:

\n\n
psql postgres
\n\n

\n\n

Create discourse_development and discourse_test database with your account short name specified as role:

\n\n
CREATE DATABASE discourse_development WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;
\n\n

Note that in above commands I specified the role as techapj, this means that my short name is techapj, replace this with your own short name.

\n\n

\n\n

Exit psql prompt by pressing controld

\n\n

Now access psql prompt in discourse_development database as your short name user:

\n\n
psql -d discourse_development -U techapj -h localhost
\n\n

Run following commands, separately:

\n\n
CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;
\n\n

\n\n

Exit psql prompt by pressing controld

\n\n

Now access psql prompt in discourse_test database as your short name user:

\n\n
psql -d discourse_test -U techapj -h localhost
\n\n

Run following commands, separately:

\n\n
CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;
\n\n

\n\n

Exit psql prompt by pressing controld

\n\n

You have set-up the database successfully!

\n\n

Bootstrap Discourse

\n\n

Switch to your Discourse folder:

\n\n
cd ~/discourse
\n\n

Install the needed gems

\n\n
bundle install
\n\n

\n\n

Now that you have successfully installed gems, run this command:

\n\n
bundle exec rake db:migrate db:test:prepare db:seed_fu
\n\n

Try running the specs:

\n\n
bundle exec rake autospec
\n\n

\n\n

All the tests should pass.

\n\n

Start rails server:

\n\n
bundle exec rails server
\n\n

\n\n

You should now be able to connect with your Discourse app on http://localhost:3000 - try it out!

\n\n

\nScreen Shot 2014-05-19 at 13.04.01.png1255x461 98.7 KB\n

\n\n

Create New Admin

\n\n

To create a new admin, run the following commands in rails console:

\n\n
RAILS_ENV=development bundle exec rake admin:create
\n\n

Just enter your input as suggested, you can create an admin account.

\n\n

\nfccdb29463e82f23.png1919x430\n

\n\n

\nScreen Shot 2014-05-19 at 13.20.02.png1256x756 124 KB\n

\n\n

Happy hacking!

', + '

So you want to set up Discourse on Mac OS X to hack on and develop with?

\n\n

We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Mac. Let\'s begin!

\n\n

(If you want to install Discourse for production use, see our install guide)

\n\n

Install Discourse Dependencies

\n\n

Run this script in terminal, to setup Rails development environment:

\n\n
bash <(curl -s https://raw.githubusercontent.com/techAPJ/install-rails/master/mac)
\n\n

This script will install following new packages on your system:

\n\n\n\n

In case you have any of this package pre-installed and don\'t want to run entire script, see the script and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.

\n\n

Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.

\n\n

Clone Discourse

\n\n

Clone the Discourse repository in ~/discourse folder:

\n\n
git clone https://github.com/discourse/discourse.git ~/discourse
\n\n

\n\n

~ indicates home folder, so Discourse source code will be available in your home folder.

\n\n

Setup Database

\n\n

Open psql prompt:

\n\n
psql postgres
\n\n

\n\n

Create discourse_development and discourse_test database with your account short name specified as role:

\n\n
CREATE DATABASE discourse_development WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;
\n\n

Note that in above commands I specified the role as techapj, this means that my short name is techapj, replace this with your own short name.

\n\n

\n\n

Exit psql prompt by pressing controld

\n\n

Now access psql prompt in discourse_development database as your short name user:

\n\n
psql -d discourse_development -U techapj -h localhost
\n\n

Run following commands, separately:

\n\n
CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;
\n\n

\n\n

Exit psql prompt by pressing controld

\n\n

Now access psql prompt in discourse_test database as your short name user:

\n\n
psql -d discourse_test -U techapj -h localhost
\n\n

Run following commands, separately:

\n\n
CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;
\n\n

\n\n

Exit psql prompt by pressing controld

\n\n

You have set-up the database successfully!

\n\n

Bootstrap Discourse

\n\n

Switch to your Discourse folder:

\n\n
cd ~/discourse
\n\n

Install the needed gems

\n\n
bundle install
\n\n

\n\n

Now that you have successfully installed gems, run this command:

\n\n
bundle exec rake db:migrate db:test:prepare db:seed_fu
\n\n

Try running the specs:

\n\n
bundle exec rake autospec
\n\n

\n\n

All the tests should pass.

\n\n

Start rails server:

\n\n
bundle exec rails server
\n\n

\n\n

You should now be able to connect with your Discourse app on http://localhost:3000 - try it out!

\n\n

\nScreen Shot 2014-05-19 at 13.04.01.png1255x461 98.7 KB\n

\n\n

Create New Admin

\n\n

To create a new admin, run the following commands in rails console:

\n\n
RAILS_ENV=development bundle exec rake admin:create
\n\n

Just enter your input as suggested, you can create an admin account.

\n\n

\nfccdb29463e82f23.png1919x430\n

\n\n

\nScreen Shot 2014-05-19 at 13.20.02.png1256x756 124 KB\n

\n\n

Happy hacking!

', post_number: 1, post_type: 1, updated_at: "2015-04-26T06:51:23.549Z", @@ -339,7 +339,7 @@ export default { uploaded_avatar_id: null, created_at: "2014-01-24T15:08:06.111Z", cooked: - '

Continuing the discussion from Log of setting up Docker in Virtualbox:

\n\n\n\n

What is the preferred development environment these days? I have Vagrant up and running as recommended in Discourse as Your First Rails App and Discourse Vagrant Developer Guide, but much of the recent discussion has been about Discourse Docker (which I freely admit I haven\'t really looked at for lack of time).

\n\n

For development purposes, should I carry on using Vagrant for the time being? Or should I be setting up a VM with Ubuntu and then installing Docker and Discourse Docker?

\n\n

(As a related side issue, my current production environment was built by following the Discourse Install Guide. Would it be prudent to switch that over to Docker at some point as well? Meaning, is version 1.0 likely to recommend Docker instead of a raw installation? This question deserves a topic of its own in some other category, but it seems best to see what people have to say about development environments before launching a second, better-informed discussion about production environments.)

\n\n

So, for development, Vagrant or Docker?

', + '

Continuing the discussion from Log of setting up Docker in Virtualbox:

\n\n\n\n

What is the preferred development environment these days? I have Vagrant up and running as recommended in Discourse as Your First Rails App and Discourse Vagrant Developer Guide, but much of the recent discussion has been about Discourse Docker (which I freely admit I haven\'t really looked at for lack of time).

\n\n

For development purposes, should I carry on using Vagrant for the time being? Or should I be setting up a VM with Ubuntu and then installing Docker and Discourse Docker?

\n\n

(As a related side issue, my current production environment was built by following the Discourse Install Guide. Would it be prudent to switch that over to Docker at some point as well? Meaning, is version 1.0 likely to recommend Docker instead of a raw installation? This question deserves a topic of its own in some other category, but it seems best to see what people have to say about development environments before launching a second, better-informed discussion about production environments.)

\n\n

So, for development, Vagrant or Docker?

', post_number: 1, post_type: 1, updated_at: "2014-01-24T15:08:06.111Z", diff --git a/spec/fixtures/onebox/githubfolder-discourse-root.response b/spec/fixtures/onebox/githubfolder-discourse-root.response index 23075c565b4..d88ba433af0 100644 --- a/spec/fixtures/onebox/githubfolder-discourse-root.response +++ b/spec/fixtures/onebox/githubfolder-discourse-root.response @@ -111,7 +111,7 @@ - + @@ -578,7 +578,7 @@
- + View license @@ -940,7 +940,7 @@

Git stats

- .github + .github
@@ -999,7 +999,7 @@
- app + app
@@ -1018,7 +1018,7 @@
- bin + bin
@@ -1037,7 +1037,7 @@
- config + config
@@ -1056,7 +1056,7 @@
- db + db
@@ -1075,7 +1075,7 @@
- docs + docs
@@ -1094,7 +1094,7 @@
- images + images
@@ -1113,7 +1113,7 @@
- lib + lib
@@ -1132,7 +1132,7 @@
- log + log
@@ -1151,7 +1151,7 @@
- plugins + plugins
@@ -1170,7 +1170,7 @@
- public + public
@@ -1189,7 +1189,7 @@
- script + script
@@ -1208,7 +1208,7 @@
- spec + spec
@@ -1227,7 +1227,7 @@
- test + test
@@ -1246,7 +1246,7 @@
- vendor + vendor
@@ -1265,7 +1265,7 @@
- .editorconfig + .editorconfig
@@ -1284,7 +1284,7 @@
- .eslintignore + .eslintignore
@@ -1303,7 +1303,7 @@
- .eslintrc + .eslintrc
@@ -1322,7 +1322,7 @@
- .git-blame-ignore-revs + .git-blame-ignore-revs
@@ -1341,7 +1341,7 @@
- .gitattributes + .gitattributes
@@ -1360,7 +1360,7 @@
- .gitignore + .gitignore
@@ -1379,7 +1379,7 @@
- .licensed.yml + .licensed.yml
@@ -1398,7 +1398,7 @@
- .prettierignore + .prettierignore
@@ -1417,7 +1417,7 @@
- .prettierrc + .prettierrc
@@ -1436,7 +1436,7 @@
- .rspec + .rspec
@@ -1455,7 +1455,7 @@
- .rspec_parallel + .rspec_parallel
@@ -1474,7 +1474,7 @@
- .rubocop.yml + .rubocop.yml
@@ -1493,7 +1493,7 @@
- .ruby-gemset.sample + .ruby-gemset.sample
@@ -1512,7 +1512,7 @@
- .ruby-version.sample + .ruby-version.sample
@@ -1531,7 +1531,7 @@
- .template-lintrc.js + .template-lintrc.js
@@ -1550,7 +1550,7 @@
- Brewfile + Brewfile
@@ -1569,7 +1569,7 @@
- CONTRIBUTING.md + CONTRIBUTING.md
@@ -1588,7 +1588,7 @@
- COPYRIGHT.txt + COPYRIGHT.txt
@@ -1607,7 +1607,7 @@
- Dangerfile + Dangerfile
@@ -1626,7 +1626,7 @@
- Gemfile + Gemfile
@@ -1645,7 +1645,7 @@
- Gemfile.lock + Gemfile.lock
@@ -1664,7 +1664,7 @@
- LICENSE.txt + LICENSE.txt
@@ -1683,7 +1683,7 @@
- README.md + README.md
@@ -1702,7 +1702,7 @@
- Rakefile + Rakefile
@@ -1721,7 +1721,7 @@
- adminjs + adminjs
@@ -1740,7 +1740,7 @@
- config.ru + config.ru
@@ -1759,7 +1759,7 @@
- d + d
@@ -1778,7 +1778,7 @@
- discourse.sublime-project + discourse.sublime-project
@@ -1797,7 +1797,7 @@
- jsapp + jsapp
@@ -1816,7 +1816,7 @@
- lefthook.yml + lefthook.yml
@@ -1835,7 +1835,7 @@
- package.json + package.json
@@ -1854,7 +1854,7 @@
- translator.yml + translator.yml
@@ -1873,7 +1873,7 @@
- yarn.lock + yarn.lock
@@ -1941,10 +1941,10 @@
  • If you're on Ubuntu, try the Ubuntu development guide.
  • If you're on Windows, try the Windows 10 development guide.
    • -

    If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the Discourse Advanced Developer Guide, which is aimed primarily at Ubuntu and macOS environments.

    -

    Before you get started, ensure you have the following minimum versions: Ruby 2.6+, PostgreSQL 10+, Redis 4.0+. If you're having trouble, please see our TROUBLESHOOTING GUIDE first!

    +

    If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the Discourse Advanced Developer Guide, which is aimed primarily at Ubuntu and macOS environments.

    +

    Before you get started, ensure you have the following minimum versions: Ruby 2.6+, PostgreSQL 10+, Redis 4.0+. If you're having trouble, please see our TROUBLESHOOTING GUIDE first!

    Setting up Discourse

    -

    If you want to set up a Discourse forum for production use, see our Discourse Install Guide.

    +

    If you want to set up a Discourse forum for production use, see our Discourse Install Guide.

    If you're looking for business class hosting, see discourse.org/buy.

    Requirements

    Discourse is built for the next 10 years of the Internet, so our requirements are high.

    @@ -1988,7 +1988,7 @@
  • Redis — We use Redis as a cache and for transient data.
  • BrowserStack — We use BrowserStack to test on real devices and browsers.
    • -

    Plus lots of Ruby Gems, a complete list of which is at /master/Gemfile.

    +

    Plus lots of Ruby Gems, a complete list of which is at /master/Gemfile.

    Contributing

    Build Status

    Discourse is 100% free and open source. We encourage and support an active, healthy community that @@ -1997,15 +1997,15 @@ accepts contributions from the public – including you!

    1. Please read the complete mission statements on discourse.org. Yes we actually believe this stuff; you should too.
    2. Read and sign the Electronic Discourse Forums Contribution License Agreement.
      3. -
    3. Dig into CONTRIBUTING.MD, which covers submitting bugs, requesting new features, preparing your code for a pull request, etc.
      4. -
    4. Always strive to collaborate with mutual respect.
      5. +
    5. Dig into CONTRIBUTING.MD, which covers submitting bugs, requesting new features, preparing your code for a pull request, etc.
      6. +
    6. Always strive to collaborate with mutual respect.
    7. Not sure what to work on? We've got some ideas.

    We look forward to seeing your pull requests!

    Security

    -

    We take security very seriously at Discourse; all our code is 100% open source and peer reviewed. Please read our security guide for an overview of security measures in Discourse, or if you wish to report a security issue.

    +

    We take security very seriously at Discourse; all our code is 100% open source and peer reviewed. Please read our security guide for an overview of security measures in Discourse, or if you wish to report a security issue.

    The Discourse Team

    -

    The original Discourse code contributors can be found in AUTHORS.MD. For a complete list of the many individuals that contributed to the design and implementation of Discourse, please refer to the official Discourse blog and GitHub's list of contributors.

    +

    The original Discourse code contributors can be found in AUTHORS.MD. For a complete list of the many individuals that contributed to the design and implementation of Discourse, please refer to the official Discourse blog and GitHub's list of contributors.

    Copyright / License

    Copyright 2014 - 2020 Civilized Discourse Construction Kit, Inc.

    Licensed under the GNU General Public License Version 2.0 (or later); @@ -2078,7 +2078,7 @@ limitations under the License.

    License

    - + View license diff --git a/spec/fixtures/onebox/githubfolder.response b/spec/fixtures/onebox/githubfolder.response index 6e2ae422213..81198e89653 100644 --- a/spec/fixtures/onebox/githubfolder.response +++ b/spec/fixtures/onebox/githubfolder.response @@ -105,14 +105,14 @@ - + - + @@ -158,7 +158,7 @@
    Sign up @@ -431,13 +431,13 @@ Sign in Sign up @@ -524,7 +524,7 @@
    -
    discourse/spec/fixtures/
    +
    discourse/spec/fixtures/
    @@ -797,7 +797,7 @@ Co-authored-by: Gerhard Schlager <mail@gerhard-schlager.at>

    Git stats

    - + . .
    @@ -843,7 +843,7 @@ Co-authored-by: Gerhard Schlager <mail@gerhard-schlager.at>
    - backups + backups
    @@ -866,7 +866,7 @@ This also ensures that restoring a backup works when it was created with the wro
    - csv + csv
    @@ -887,7 +887,7 @@ This also ensures that restoring a backup works when it was created with the wro
    - db + db
    @@ -910,7 +910,7 @@ The `EXECUTE FUNCTION` syntax for `CREATE TRIGGER` statements was introduced in
    - emails + emails
    @@ -935,7 +935,7 @@ This is a PR of the renaming whitelist to allowlist and blacklist to the blockli
    - encodings + encodings
    @@ -956,7 +956,7 @@ This is a PR of the renaming whitelist to allowlist and blacklist to the blockli
    - feed + feed
    @@ -977,7 +977,7 @@ This is a PR of the renaming whitelist to allowlist and blacklist to the blockli
    - i18n + i18n
    @@ -1000,7 +1000,7 @@ follow-up to 6d8eb9c1" class="link-gray" href="/discourse/discourse/commit/a77d8
    - images + images
    @@ -1029,7 +1029,7 @@ follow-up to 6d8eb9c1" class="link-gray" href="/discourse/discourse/commit/a77d8
    - json + json
    @@ -1066,7 +1066,7 @@ follow-up to 6d8eb9c1" class="link-gray" href="/discourse/discourse/commit/a77d8
    - md + md
    @@ -1087,7 +1087,7 @@ follow-up to 6d8eb9c1" class="link-gray" href="/discourse/discourse/commit/a77d8
    - media + media
    @@ -1116,7 +1116,7 @@ See https://meta.discourse.org/t/cannot-download-non-image-media-files-original-
    - mmdb + mmdb
    @@ -1145,7 +1145,7 @@ See https://meta.discourse.org/t/cannot-download-non-image-media-files-original-
    - multisite + multisite
    @@ -1166,7 +1166,7 @@ See https://meta.discourse.org/t/cannot-download-non-image-media-files-original-
    - onebox + onebox
    @@ -1219,7 +1219,7 @@ Co-authored-by: Gerhard Schlager <mail@gerhard-schlager.at>" class="link-g
    - pdf + pdf
    @@ -1244,7 +1244,7 @@ Co-authored-by: Maja Komel <maja.komel@gmail.com>" class="link-gray" href=
    - plugins + plugins
    @@ -1270,7 +1270,7 @@ moment." class="link-gray" href="/discourse/discourse/commit/cdb7ddc258c6a459bdf
    - scss + scss
    @@ -1291,7 +1291,7 @@ moment." class="link-gray" href="/discourse/discourse/commit/cdb7ddc258c6a459bdf
    - site_settings + site_settings
    @@ -1316,7 +1316,7 @@ Noted:
    - theme_settings + theme_settings
    @@ -1337,7 +1337,7 @@ Noted:
    - themes + themes
    @@ -1378,7 +1378,7 @@ This pull request is related to https://meta.discourse.org/t/uploaded-js-file-fo
    - woff2 + woff2
    diff --git a/spec/lib/onebox/engine/github_folder_onebox_spec.rb b/spec/lib/onebox/engine/github_folder_onebox_spec.rb index d050ec18e2b..6a9d0c18a3a 100644 --- a/spec/lib/onebox/engine/github_folder_onebox_spec.rb +++ b/spec/lib/onebox/engine/github_folder_onebox_spec.rb @@ -5,8 +5,8 @@ require "rails_helper" describe Onebox::Engine::GithubFolderOnebox do context 'without fragments' do before do - @link = "https://github.com/discourse/discourse/tree/master/spec/fixtures" - @uri = "https://github.com/discourse/discourse/tree/master/spec/fixtures" + @link = "https://github.com/discourse/discourse/tree/main/spec/fixtures" + @uri = "https://github.com/discourse/discourse/tree/main/spec/fixtures" stub_request(:get, @uri).to_return(status: 200, body: onebox_response(described_class.onebox_name)) end @@ -16,7 +16,7 @@ describe Onebox::Engine::GithubFolderOnebox do describe "#to_html" do it "includes link to folder with truncated display path" do - expect(html).to include("master/spec/fixtures") + expect(html).to include("master/spec/fixtures") end it "includes repository name" do