Dennis Schubert
|
d41711a383
|
Merge branch 'stable' into develop
|
2016-06-19 05:38:59 +02:00 |
|
Dennis Schubert
|
7fb6ffbb4d
|
Don't require guard-rspec
since it causes an ugly warning in the console!
|
2016-06-19 05:37:41 +02:00 |
|
Dennis Schubert
|
61fb7410cc
|
Merge pull request #6844 from cmrd-senya/unique-aspect-visibilities
Fix possible duplication of AspectVisibility
|
2016-06-19 01:49:41 +02:00 |
|
Dennis Schubert
|
49395c0a11
|
Merge pull request #6812 from cmrd-senya/6811-visibilities-id-overlap
Don't include wrong shareable types in scopes
|
2016-06-19 01:40:01 +02:00 |
|
Dennis Schubert
|
f1e296cc52
|
Merge pull request #6870 from svbergerem/update-status-message-text-prefill-mention
Update status message text after prefilling mentions
|
2016-06-19 01:03:26 +02:00 |
|
Dennis Schubert
|
2e2671120c
|
Merge pull request #6869 from SuperTux88/fix-changelog_url-spec
fix spec for ApplicationHelper#changelog_url
|
2016-06-19 01:02:27 +02:00 |
|
Steffen van Bergerem
|
657eec29f0
|
Update status message text after prefilling mentions
|
2016-06-18 23:29:59 +02:00 |
|
Benjamin Neff
|
30ea6ef72f
|
fix spec for ApplicationHelper#changelog_url
|
2016-06-18 23:12:29 +02:00 |
|
Dennis Schubert
|
c357d229ed
|
Merge pull request #6868 from svbergerem/eslint-drop-max-nested-callbacks
Eslint drop max nested callbacks and add "=" marker to spaced comment
|
2016-06-18 10:45:57 +02:00 |
|
Steffen van Bergerem
|
c1734fd800
|
Add = marker to spaced comment eslint rule
|
2016-06-18 10:34:28 +02:00 |
|
Steffen van Bergerem
|
41b49341e2
|
Drop max-nested-callbacks from eslint config
|
2016-06-18 10:29:09 +02:00 |
|
Dennis Schubert
|
f9e0469183
|
Use a forked version of eslintrb for now
fixes #6866
upstream https://github.com/zendesk/eslintrb/pull/7
|
2016-06-17 07:32:31 +02:00 |
|
Dennis Schubert
|
0db7252630
|
Merge pull request #6863 from SuperTux88/remove-REDISTOGO_URL-deprecation
remove REDISTOGO_URL deprecation
|
2016-06-16 02:52:54 +02:00 |
|
Dennis Schubert
|
673740b93c
|
Merge pull request #6860 from svbergerem/eslint
Use eslint instead of jshint
|
2016-06-16 02:50:27 +02:00 |
|
Steffen van Bergerem
|
8ba1618fb5
|
Bump terminal-table
|
2016-06-16 02:41:48 +02:00 |
|
Steffen van Bergerem
|
cec7fcd964
|
Bump hamlit
|
2016-06-16 02:39:45 +02:00 |
|
Steffen van Bergerem
|
02bd6c3c3e
|
Bump eye
|
2016-06-16 02:39:37 +02:00 |
|
Dennis Schubert
|
45063bf08d
|
Merge branch 'stable' into develop
|
2016-06-16 02:39:20 +02:00 |
|
Steffen van Bergerem
|
0d9fe532e7
|
Bump ruby-progressbar
|
2016-06-16 02:34:05 +02:00 |
|
Steffen van Bergerem
|
7defbf93a8
|
Bump parser
|
2016-06-16 02:34:04 +02:00 |
|
Steffen van Bergerem
|
5e9b32cc00
|
Bump mime-types
|
2016-06-16 02:34:04 +02:00 |
|
Steffen van Bergerem
|
5f340484a0
|
Bump font-awesome-rails
|
2016-06-16 02:34:04 +02:00 |
|
Steffen van Bergerem
|
156f9dfd25
|
Bump fog-core
|
2016-06-16 02:34:04 +02:00 |
|
Steffen van Bergerem
|
d397568f98
|
Bump cucumber
|
2016-06-16 02:34:04 +02:00 |
|
Steffen van Bergerem
|
0fb2f8cd70
|
Bump ast
|
2016-06-16 02:34:04 +02:00 |
|
Steffen van Bergerem
|
d6341c21c7
|
Bump webmock
|
2016-06-16 02:34:03 +02:00 |
|
Steffen van Bergerem
|
966166f057
|
Bump ruby-oembed
|
2016-06-16 02:34:03 +02:00 |
|
Steffen van Bergerem
|
8182dfb818
|
Drop rspec-instafail dependency
|
2016-06-16 02:34:03 +02:00 |
|
Steffen van Bergerem
|
1158b0a41c
|
Bump rails-assets-markdown-it
|
2016-06-16 02:34:03 +02:00 |
|
Steffen van Bergerem
|
47d427cf44
|
Bump rails-assets-higlightjs
|
2016-06-16 02:34:03 +02:00 |
|
Steffen van Bergerem
|
c33383c4aa
|
Bump pry-byebug
|
2016-06-16 02:34:02 +02:00 |
|
Steffen van Bergerem
|
df0c26da5c
|
Bump json-schema
|
2016-06-16 02:34:02 +02:00 |
|
Steffen van Bergerem
|
86aab68c8e
|
Bump js-routes
|
2016-06-16 02:34:02 +02:00 |
|
Steffen van Bergerem
|
f5d8ae68c1
|
Bump guard-rspec
|
2016-06-16 02:34:02 +02:00 |
|
Steffen van Bergerem
|
8af192d6bd
|
Bump guard
|
2016-06-16 02:34:02 +02:00 |
|
Steffen van Bergerem
|
86d8c5f239
|
Bump autoprefixer-rails
|
2016-06-16 02:01:06 +02:00 |
|
Benjamin Neff
|
d68c1ad974
|
remove REDISTOGO_URL deprecation
|
2016-06-14 06:40:34 +02:00 |
|
Jonne Haß
|
e0fdfdb0fa
|
Merge pull request #6861 from svbergerem/status-message-creation-service-spec
Improve status message creation service spec
|
2016-06-12 12:10:39 +02:00 |
|
Steffen van Bergerem
|
b84eff62ea
|
Improve status message creation service spec
|
2016-06-12 11:48:11 +02:00 |
|
Steffen van Bergerem
|
e7227891e7
|
Use eslint instead of jshint
|
2016-06-12 10:03:59 +02:00 |
|
Dennis Schubert
|
520d80cc1a
|
Merge branch 'stable' into develop
|
2016-06-09 03:19:35 +02:00 |
|
Steffen van Bergerem
|
a14c61300e
|
Remove the publisher from the photos page
closes #6851
|
2016-06-09 03:17:52 +02:00 |
|
Steffen van Bergerem
|
8c8368d813
|
Merge pull request #6848 from cmrd-senya/6841-likes-from-profile
Fix like and reshare from the profile page
|
2016-06-08 23:26:06 +02:00 |
|
Steffen van Bergerem
|
be1016168d
|
Merge pull request #6854 from SansPseudoFix/6853-fix-overflow
6853 fix usernames overflow
|
2016-06-08 23:15:27 +02:00 |
|
Jonne Haß
|
1891b9c61e
|
Merge branch 'stable' into develop
|
2016-06-07 14:05:41 +02:00 |
|
Jonne Haß
|
4c750c8784
|
Merge branch 'master' into stable
|
2016-06-07 14:04:22 +02:00 |
|
Jonne Haß
|
0bc8e54afd
|
Update Nokogiri to 1.6.8
Which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29, addressing
a range of security issues.
See https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
for more details.
|
2016-06-07 13:51:33 +02:00 |
|
Jonne Haß
|
9346fadefc
|
Merge branch 'stable' into develop
|
2016-06-07 13:11:52 +02:00 |
|
Jonne Haß
|
c8aa323d13
|
Set ca_file explicitly for the mail gem too
|
2016-06-07 13:11:32 +02:00 |
|
SansPseudoFix
|
5bac12d164
|
6853 fix usernames overflox
|
2016-06-07 13:02:44 +02:00 |
|