Commit graph

190 commits

Author SHA1 Message Date
Aral Balkan
61d6d17904 Update command to checkout latest release.
The git tag command was incorrectly checking out release candidates instead of the latest release. Fixes #309
2017-06-15 17:22:04 +02:00
Benoît S
445dc18cd9 Missing RAILS_ENV=production and bundle exec
If you're omitting RAILS_ENV and `bundle exec` you'll have:

~~~
rake aborted!                             
NameError: uninitialized constant Annotate
[…]
~~~
2017-06-14 17:40:01 +02:00
Raphael Lullis
491e44c346 Create Serving_a_different_domain.md
The location directive was missing the "=" operator.
2017-06-11 03:55:38 +02:00
Valentin Lorentz
e2fcb2f407 Update resources of oc.todon.fr 2017-06-04 17:24:38 +02:00
zunda
58d6dcb46a Remove the procedure to run rake secret outside the container
This change will help users avoid unnecessary procedure to
complete `bundle install` outside the container.

The explanation

> To generate the PAPERCLIP_SECRET, SECRET_KEY_BASE, and
> OTP_SECRET, you may use:
>
> ```
> rake secret
> ```

gives users a false impression that secrets have to be filled in
before the image can be built. Here, with introduction of CLD3,
completion of `bundle install` became more involved procedure to
prepare tools and libraries as well as higher version of Ruby.
2017-06-02 21:19:30 -10:00
USAMI Kenta
e8bcf6a035 Explicitly use --provider option for vagrant up
When a provider other than virtualbox is registered in Vagrant, `vagrant up` can not start Mastodon.
For example, it corresponds to the environment where Parallels Desktop is installed.
2017-05-31 12:52:03 +09:00
koug44
473152c792 Update on apache configuration
Added the needed ProxyPass exceptions for 1.4.1
2017-05-29 17:32:17 -04:00
Myles Braithwaite
2da7d4fc0a Needed pkg-config to install cld3.
In Debian the package `pkg-config` is required to install the rubygem `cld3`.
2017-05-29 14:36:32 -04:00
Eugen Rochko
cc88ba21df Merge pull request #272 from tootsuite/fix-custom-scss
Update customization guide
2017-05-27 16:55:17 +02:00
Eugen Rochko
d892b9ff8f Update customization guide 2017-05-27 16:51:28 +02:00
Eugen Rochko
8b5d2ba471 Fix API docs by adding missing attributes and methods, fix example
nginx config by removing overly specific configuration options
that confuse more than they help
2017-05-26 17:29:47 +02:00
Eugen Rochko
d17b64e130 Merge pull request #129 from danhunsaker/feature/nanobox
Document Nanobox Usage
2017-05-23 16:57:23 +02:00
Nolan Lawson
6b29d736ec s/assets/packs/
`assets` are now at `packs`. Unfortunately this change will permanently cache `stats.json` and `report.html`, but these aren't super critical since they're just for debugging. I confirmed that `manifest.json` is not affected and no other non-fingerprinted assets are affected.
2017-05-22 20:07:40 -07:00
Diana Thayer
887837ab87 Update Development-guide.md
Since the document specifies the `--pure-lockfile` flag, it seems inaccurate to say, "Similarly, installing JavaScript dependencies doesn't require any flags."

I've changed the text accordingly. I hope it's appropriate!
2017-05-21 22:57:17 -07:00
Eugen Rochko
770c90da74 Merge pull request #239 from jeroenpraat/patch-2
explaining DB_POOL better
2017-05-22 04:23:21 +02:00
Eugen Rochko
b71e181661 Merge pull request #244 from seefood/patch-1
dependencies and webpacker
2017-05-22 04:21:43 +02:00
Eugen Rochko
f4e6c29a53 Update Development-guide.md 2017-05-22 04:21:32 +02:00
Eugen Rochko
9a89190202 Update Development-guide.md 2017-05-22 04:20:26 +02:00
Eugen Rochko
c29f6f2ee6 Update Development-guide.md 2017-05-22 04:19:33 +02:00
Chad Ingram
d0b9bb8801 Update Development-guide.md
Add protobuf to brew install line - needed by cld3
2017-05-17 00:08:04 -04:00
Eugen Rochko
afaa3feda1 Merge pull request #251 from aral/mac-development-environment-instructions
Mac development environment instructions
2017-05-16 16:56:15 +02:00
Aral Balkan
ab538eeb51
Fix typo on Mac developer guide 2017-05-16 16:45:40 +02:00
Aral Balkan
0f26e2962a
Cosmetic: removed trailing line in code on Mac dev guide 2017-05-16 16:31:44 +02:00
Aral Balkan
9de932c427
Change order of prerequisites in Mac development guide
Xcode commandline tools need to be installed before ffmpeg is
as they’re used to compile it.
2017-05-16 16:20:03 +02:00
Aral Balkan
34071d26d0
Improve running instructions in Mac development guide (#250) 2017-05-16 16:09:37 +02:00
Aral Balkan
c84f141e22
Add Mac development environment setup instructions. Closes #250 2017-05-16 16:04:50 +02:00
Myles Braithwaite
9f752db5e0 Added note about adding backports on Debian. (#249)
Added a note about having to add Debian Backports repository to properly install `ffmpeg`.
2017-05-15 16:24:12 -07:00
Ira Abramov
acf56f2266 Webpacker addition after v1.3.3 requires a documentation as well. 2017-05-13 18:48:49 +03:00
Ira
3f4db4fe31 Packages that were needed in my dev env
Packages that were needed in my dev env
2017-05-13 18:11:55 +03:00
Luc Didry
70bddee7d3 Add munin plugins repositories 2017-05-11 11:23:32 +02:00
Valentin Lorentz
2c51aa53f8 Add missing queue to the sidekiq command 2017-05-10 19:21:51 +02:00
jeroenpraat
1c5e3bce14 explaining DB_POOL better 2017-05-10 16:29:26 +02:00
Akihiko Odaki
00f401ba6f Update "Customizing your instance" according to a change in Mastodon (#234)
This change reflects commit af6a84da147f4230807b37c64bc09760e6ab5055 in
mastodon repository.
2017-05-10 15:47:03 +02:00
Akihiko Odaki
124598b206 Add dependencies for CLD3 (#235)
This reflects commit d5cabfe5c65ac29d2f9c151b46c01a9fd885a9e0 in mastodon
repository.
2017-05-10 15:46:17 +02:00
Isao Sugimoto
e97ec8f8ff more better instructions of debian jessie-backports (#232)
* more better instructions of debian jessie-backports

* minor fix
2017-05-09 09:10:10 -07:00
Ash Furrow
3ad0c4ab19 Updates for Docker documentation. See discussion in #136. (#214) 2017-05-09 10:12:02 +02:00
Darius Kazemi
03ee8bedfa Add a Debian 8 installation note (#223)
* Add a Debian 8 installation note

According to the conversation in f0a863feec, Debian 8 installs
an older version of nginx by default. This adds a note telling people
how to install a newer one.

* updating wording
2017-05-09 08:10:16 +02:00
Darius Kazemi
2be17b694c Merge pull request #193 from alifianmahardhika/patch-1
Update Vagrant-guide.md
2017-05-08 11:33:09 -07:00
Darius Kazemi
5b91212370 Merge pull request #204 from nolanlawson/fwenzel-patch-1
Add default CSP (take 2)
2017-05-08 11:16:49 -07:00
Nolan Lawson
8a57435b88 remove referrer-policy: strict-origin-when-cross-origin 2017-05-07 19:42:46 -07:00
Nolan Lawson
444beff404 remove unsafe-inline from script-src 2017-05-07 19:34:52 -07:00
Jarek Lipski
443ee05b75 Remove duplicate line in Administration guide 2017-05-07 22:41:19 +02:00
Darius Kazemi
234175e30a Merge pull request #210 from tootsuite/Gargron-patch-1
Fix Node.js installation recommendation, also use 6.x
2017-05-07 10:15:22 -07:00
Eugen Rochko
50edeb67e2 Merge pull request #196 from kagucho/master
Use "sudo -u" instead of "sudo su"
2017-05-07 14:45:59 +02:00
Eugen Rochko
1f202dedc1 Merge pull request #203 from wolfyshy/master
Update Apache configuration a bit
2017-05-07 00:51:34 +02:00
Eugen Rochko
a8da345a79 Merge pull request #209 from suoko/patch-1
Updated Administration-guide.md
2017-05-07 00:45:13 +02:00
Eugen Rochko
530ce36181 Merge pull request #212 from suoko/patch-2
Update Administration-guide.md
2017-05-07 00:43:43 +02:00
Eugen Rochko
07309d26dd Merge pull request #202 from takayamaki/fix_pgbouncer_guide
fix section "Configuring userlist.txt" of PgBouncer-guide.md
2017-05-07 00:42:03 +02:00
takayamaki
0b79565316 fix section "Configuring userlist.txt" of PgBouncer-guide.md
fix order of username and password when generating hash with md5sum
https://pgbouncer.github.io/config.html#authentication-file-format
2017-05-07 05:09:42 +09:00
suoko
fd3927b956 Update Administration-guide.md
Update for those using docker
2017-05-06 13:53:15 +02:00