Benjamin Neff
f3d2a54050
Merge branch 'next-minor' into develop
2018-06-16 04:36:13 +02:00
cmrd Senya
87968284ba
Support fetching StatusMessage by Poll guid
...
When public fetch is requested with Poll guid, return parent
StatusMessage for it, which includes the Poll in its turn.
closes #7815
2018-06-16 04:36:05 +02:00
Radomír Bosák
cfa7724d73
Escape asterisks in README
...
Unescaped asterisks can cause markdown text to be misinterpreted. Also
syntax highlighters (e.g. in sublime text) freak out.
References: [markdown
spec](https://daringfireball.net/projects/markdown/syntax#em )
closes #7821
2018-06-16 04:32:38 +02:00
Benjamin Neff
212da3a2b7
Merge branch 'next-minor' into develop
2018-06-16 01:23:10 +02:00
Alex Tribble
1b03265c2e
Allow fonts to be served from asset host in CSP.
...
Closes #7796
closes #7825
2018-06-16 01:22:22 +02:00
Benjamin Neff
fa615533f6
Bump kostya-sigar
...
Fixes compatibility with newer glibc
closes #7828
2018-06-16 01:19:36 +02:00
Benjamin Neff
f863cf08a0
Merge branch 'next-minor' into develop
2018-05-16 19:10:09 +02:00
Benjamin Neff
ebaa209120
Remove gemnasium badge
...
See: https://docs.gitlab.com/ee/user/project/import/gemnasium.html
2018-05-16 19:09:34 +02:00
Benjamin Neff
0cb212e6cb
Merge branch 'next-minor' into develop
2018-05-16 00:54:46 +02:00
cmrd Senya
a3378ae744
Account merging: handle duplicates for TagFollowing
...
I missed it in #7803
closes #7807
2018-05-16 00:54:16 +02:00
Benjamin Neff
2a60cb30a1
Merge branch 'next-minor' into develop
2018-05-03 21:33:10 +02:00
cmrd Senya
cb294fd3f4
Add completed_at to account_migrations
...
Use completed_at datetime field as an indication of a performed migration
closes #7805
2018-05-03 21:31:29 +02:00
cmrd Senya
e9f6dbdffd
Add unique index to poll participations on author_id and poll_id
...
Previously we had only a Rails validation which ensured poll participation
uniqueness but this adds uniqueness control to the database level, so that
uniqueness is guaranteed even when changing data with avoiding Rails
validations.
closes #7798
2018-05-03 21:28:38 +02:00
Benjamin Neff
22d1ad995c
Merge branch 'next-minor' into develop
2018-04-30 22:54:33 +02:00
Benjamin Neff
b7cd9d6238
Merge branch 'master' into next-minor
2018-04-30 22:54:03 +02:00
Benjamin Neff
42ceb8b3e3
Merge branch 'release/0.7.5.0'
2018-04-30 22:51:23 +02:00
Benjamin Neff
6a3d9ede52
Make ja-KS avaliable
2018-04-30 22:18:55 +02:00
Benjamin Neff
f5350e2df6
updated 77 locale files [ci skip]
2018-04-30 22:10:06 +02:00
cmrd Senya
8680b24a2e
Account merging support
...
Adds support for merging accounts with account migration by eliminating
duplicate data in favor of the target user's data.
closes #7803
2018-04-30 22:06:34 +02:00
Dennis Schubert
360ea20367
Merge branch 'next-minor' into develop
2018-04-23 20:37:03 +02:00
Dennis Schubert
8d6c891ecb
Prepare 0.7.6.0 cycle
2018-04-23 20:35:18 +02:00
Dennis Schubert
74bac8c495
Merge branch 'next-minor' into develop
2018-04-23 20:33:20 +02:00
HankG
211e5cd1bc
Bugfix 7714 twitter char overflow
...
closes #7791
2018-04-23 20:33:07 +02:00
Benjamin Neff
c061425022
Add changelog entry for #7788 [ci skip]
2018-04-16 01:32:41 +02:00
Benjamin Neff
c643743df0
Merge pull request #7788 from SuperTux88/remove-mention-backport
...
Remove backporting of mention syntax
2018-04-16 01:27:47 +02:00
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop
2018-04-16 01:26:56 +02:00
Dennis Schubert
6918dbc761
Randomize start times of daily Sidekiq-Cron jobs
...
closes #7787
2018-04-16 01:26:48 +02:00
Steffen van Bergerem
53d58a8bcb
Remove fileuploader.css
...
closes #7778
2018-04-16 01:24:38 +02:00
Benjamin Neff
8daf934c45
Remove backporting of mention syntax
...
fixes #7276 , #7392 and #7640
2018-04-15 15:49:23 +02:00
Benjamin Neff
9171f6b5ef
Revert "Revert "Bump twitter-text""
...
Bump twitter-text on develop branch again
This reverts commit 15ff67499b
2018-04-12 04:01:52 +02:00
Benjamin Neff
25fc4c746a
Merge branch 'next-minor' into develop
2018-04-12 04:01:39 +02:00
Benjamin Neff
15ff67499b
Revert "Bump twitter-text"
...
This adds a new dependency (`libidn11-dev` on debian, I'm not sure about
other distros).
This reverts commit 070e4caa57
2018-04-12 04:00:41 +02:00
Benjamin Neff
bd175cfb12
Bump rails-assets-cropperjs
2018-04-12 02:50:41 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop
2018-04-12 02:49:11 +02:00
Benjamin Neff
9a661177f1
Replace rails-assets-perfect-scrollbar with rails-assets-utatti-perfect-scrollbar
...
closes #7772
2018-04-12 02:44:43 +02:00
Benjamin Neff
9fb63c8bd6
Bump tins
2018-04-12 02:41:58 +02:00
Benjamin Neff
417ec29ad0
Bump scss_lint
2018-04-12 02:41:57 +02:00
Benjamin Neff
6767465843
Bump rugged
2018-04-12 02:41:57 +02:00
Benjamin Neff
7e3e0058b6
Bump omniauth-oauth2
2018-04-12 02:41:57 +02:00
Benjamin Neff
e6c3d0c8f7
Bump octokit
2018-04-12 02:41:57 +02:00
Benjamin Neff
309d6d7049
Bump oauth
2018-04-12 02:41:57 +02:00
Benjamin Neff
6165a6664c
Bump gitlab
2018-04-12 02:41:57 +02:00
Benjamin Neff
129efe66eb
Bump et-orbi
2018-04-12 02:41:57 +02:00
Benjamin Neff
ed8c03860a
Bump chunky_png
2018-04-12 02:41:57 +02:00
Benjamin Neff
0e526f9221
Bump jasmine
...
Disable random tests for now, many tests fail when this is true (which
is now default)
2018-04-12 02:41:56 +02:00
Benjamin Neff
eb68343ae1
Bump rspec and rspec-rails
2018-04-12 02:41:56 +02:00
Benjamin Neff
fc2834e7c1
Bump webmock
2018-04-12 02:41:56 +02:00
Benjamin Neff
42c93fd4cb
Bump cucumber-api-steps
2018-04-12 02:41:56 +02:00
Benjamin Neff
2b4fed8339
Bump poltergeist
2018-04-12 02:41:56 +02:00
Benjamin Neff
e0a8a5e34c
Bump database_cleaner
2018-04-12 02:41:56 +02:00
