update Node to 6.x LTS #1228

Merged
merged 2 commits into from Apr 15, 2017

3 participants

Contributor
dunn commented Apr 8, 2017

The 4.x branch entered maintenance on 1 April.

Collaborator

Great call.

@krainboltgreene krainboltgreene requested a review from Gargron Apr 8, 2017
Collaborator

Need to make sure everything works with the breaking changes from 4 -> 6. I'm pretty sure it'll be fine.

Contributor
dunn commented Apr 8, 2017

Dunno why Travis' nvm is getting confused; that version-string works fine locally.

.nvmrc
@@ -1 +1 @@
-6.7.0
+lts/boron
Gargron
Gargron Apr 8, 2017 Owner

Perhaps it expects a number version? Travis version of nvm could be different from yours.. I have not really used nvm before either, so I am not sure.

.travis.yml
@@ -28,7 +26,7 @@ before_install:
- sudo apt-get -qq update
- sudo apt-get -qq install g++-4.8
install:
- - nvm install $TRAVIS_NODE_VERSION
+ - nvm install
- npm install -g npm@3
Gargron
Gargron Apr 8, 2017 Owner

If Node 6+ comes with npm >=3, this line can be removed

@Gargron Gargron added the deployment label Apr 8, 2017
@dunn dunn update Node to 6.x LTS
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.
518c859
Contributor
dunn commented Apr 8, 2017

The Travis people replied; with language: ruby they won't guarantee a modern nvm, but I forgot we can just do 6 in the .nvmrc instead of specifying the LTS name.

@Gargron Gargron Merge branch 'master' into node-version
337de7d
@Gargron Gargron merged commit 8482f67 into tootsuite:master Apr 15, 2017

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
codeclimate no new or fixed issues
Details
@expenses expenses added a commit to expenses/mastodon-dev that referenced this pull request Apr 15, 2017
@dunn @expenses dunn + expenses update Node to 6.x LTS (#1228)
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.
fd7a45e
@expenses expenses added a commit to expenses/mastodon-dev that referenced this pull request Apr 15, 2017
@expenses expenses Update (#2)
* Remove .keep in models (#1748)

* Change usage of gsub to delete, as per Code Climate/Rubocop recommendation (#1753)

* Fix invalid byte sequence issue in nl.jsx (#1751)

* Add title attribute to URLs in statuses (#1755)

Since URLs in statuses are truncated, it would be pleasant to see the
full URL when hovering the URL (like on twitter, yes).

* Fix Japanese translation for remote_follow (#1771)

Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.

* Add missing Japanese translations (#1785)

* Remove current directory from PATH (#1779)

* Improve i18n chooser (#1804)

* Add locale spec with failing locale plus region check

* Use a more accurate locale when supplied by browser headers

Previously we were using a matching option which would use the first locale
available which matched the locale portion, even if a region was specified.

This changes to first try to find an exact match, and then fall back to the
region, and then fall back to the  default.

* Clean up default_locale method

* Introduce capybara and first feature spec (#1801)

This commit introduces Capybara and the first feature spec.

I focused on coverage for log in for the first feature spec because that would
have prevented 624a9a7 causing #1236.

* Add list of muted user to UI and Getting Started (#1799)

Add the same UI that already exists for blocked users for muted
ones and add it to the "Getting Started" menu.

* update Node to 6.x LTS (#1228)

The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.

* Custom Paperclip path. (#778)

* Custom Paperclip path.

* Document PAPERCLIP_ROOT.

* Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).

* Use image too in docker-compose (#1109)

* Use image too in docker-compose

It is possible with version 2 of compose to use both `build` and `image`

* Update docker-compose.yml

* Allow running mastodon on a different domain as the one used for identifying users (#1267)

* Allow running mastodon on a different domain as the one used for identifying users

* Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing

* Compare to web_domain instead of local_domain when dealing with feeds/API

* Correctly identify mentions to local accounts

Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.

* Add REDIS_DB env variable to configure Redis database (#1366)

* Polish translation (needs more love though) (#807)

* Polish translation (needs more love though)

* Polish translation bugfix

* bugfix for new colon-containing texts

* another bugfix. yaml is evil

* minor fix

* fixing issues pointed out by reviewers

* Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer

* Etyczny dizajn zbyt sarkastyczny, to będą założenia

* [css] reduce spacing between text elements on about pages (#1510)

* Remove unused will_paginate.page_gap key from i18n (#1815)

This value was changed recently, and every locale which had it set was using the
same value as the default. This value is still the default in the new location.

* Mispelling & minor fixes (#1814)

* Send initial state in a <script type="application/json"> tag (#1806)

* More Norwegian translations (#1805)

* Working translation for Norwegian.

* Fixes to Norwegian translation.

* Further adjustments to Norwegian translation.

* Further adjustments to Norwegian translation.

* Yet more improvements to the Norwegian translation.

* More Norwegian translations. Better terminology.

* add basic microformats tests (#1803)

as suggested, moving to view tests rather than a controller test
replaces tootsuite#1786 which i will
close momentary

* Use site title on tags#show page (#1802)

* Update Russian translation (#1733)

* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update devise.fr.yml (#1792)

* Update devise.fr.yml

Consistencies across the French translation

* Update doorkeeper.fr.yml

* Update nl.jxs (#1766)

Some rewording and switching to infinitive localization.

* Update nl.yml (#1764)

Some rewording, typos and switching to infinitve

* Update Traditional Chinese, HK (zh-HK) translation (#1759)

* Fix missing string in javascript locale (zh-HK)

* Change javascript locale (zh-HK)

* Fix some other strings that were still English.
* Improve `search.status_by`.
* Fix `notification.follow`. ("開始開始你")
* Changes according to user feedback.
  * "Back": "較前顯示" -> "返回"
  * "Home": "家" -> "主頁"

* Update ruby locale (zh-HK)

* Fix missing translation
* Normalize yml
* Update translation strings

* Add translations for zh-TW (Taiwan) (#1794)

* Update devise.fr.yml (#1728)

Very light grammar fix to improve gender-neutral

* jslint: fix jslint warnings (#1704)

* jslint: remove trailing space

* jslint: fix no-nested-ternary issue

Follow the jslint [no-nested-ternary](http://eslint.org/docs/rules/no-nested-ternary)
rule. Rewritten ternary with if-then.

* Rename admin/accounts_helper to admin/filter_helper (#1816)

- Add some spec coverage for both methods
- Add explicit constant call-outs for where the params are from

* Refresh webfinger (#1323)

* Refresh local info for remote accounts when webfinger returns new values

It only refreshes account info if one of the URLs or the public-key changes,
in which cases it refreshes the full info, re-downloading the feeds from that
user.

Some special handling should probably be done when the public key changes,
but I have been unable to find any use for it in Mastodon yet.

* Re-fetch remote users we aren't subscribed to.

This might induce performance issues, we might want to only do that for users
we explicitly attempted to subscribe but failed to.

* Refactor changes

* Do not refresh existing remote account details more than once a day

* Avoid re-fetching webfinger info in tests unless otherwise specified

* Account search service refactor (#1791)

* Begin coverage for account search service

* Coverage for hashtag query

* Coverage for calling local vs remote find based on domain presence

* Spec to check that exact matches are not duped

* Coverage of resolve option

* Coverage for account being provided

* Start to refactor account search service

* Isolate query username and domain methods

* Isolate exact_match method

* Extract methods for local and remote results

* Simplify local vs remote and account isoliation

* Extract methods for local and remote results

* Simplify de-dupe of exact match

* Simplify logic to check for non exact remotes

* Cache some methods

* Remove nil from exact_match from results array

* Return exact matches first

* Use find_remote even with no domain

Account.find_local is just an alias for Account.find_remote(user, nil) - so we
can not bother with the conditional here, and call find_remote directly.
b09e491
@dunn dunn deleted the dunn:node-version branch Apr 15, 2017
@Nyoho Nyoho pushed a commit to Nyoho/mastodon that referenced this pull request Apr 25, 2017
@dunn @Gargron dunn + Gargron update Node to 6.x LTS (#1228)
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.
9c1813b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment