Commit graph

12756 commits

Author SHA1 Message Date
Jonne Haß
2a7a0b7b99 * made number of unicorn worker processes configurable
* made configuration loader indepenent of rails
* corrected mismatch between example and default config (server.db/server.database)
2012-11-30 14:00:25 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Dennis Schubert
656e52360f Remove REEs garbage collection [ci skip]
We are not using REE anymore, so...
2012-11-29 22:57:38 +01:00
Jonne Haß
7aa0726971 use file? instead of exists? to check for correct ca bundle path 2012-11-27 21:14:44 +01:00
Jonne Haß
fc180a4521 guard: minimize running all specs [ci skip] 2012-11-26 14:30:30 +01:00
Jonne Haß
bf698f3882 Do not strip "markdown" in links when posting to services, fix #3765 2012-11-26 14:16:43 +01:00
Jonne Haß
995775955e Merge pull request #3737 from davecocoa/feature/2704-fix-aspects
Feature/2704 fix aspects
2012-11-25 10:07:20 -08:00
David McMullin
c3c603f8cd Update changelog 2012-11-25 17:41:58 +00:00
David McMullin
0873ae9ab7 improve behaviour of deselect all 2012-11-25 17:38:19 +00:00
David McMullin
f290bcf169 add tests so it doesn't break again 2012-11-25 17:38:19 +00:00
David McMullin
f6b32fd13a rename the JS so the magic can return 2012-11-25 17:38:19 +00:00
Jonne Haß
96924b8458 updated changelog [ci skip] 2012-11-25 18:31:40 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags
port tagFollowings to BackBone
2012-11-25 09:30:47 -08:00
Jonne Haß
e536622c4b update changelog [ci skip] 2012-11-25 18:25:51 +01:00
Jonne Haß
6540fda1e7 Merge pull request #3748 from rschaden/3271-invitation-email-validation
3271 invitation email validation
2012-11-25 09:18:29 -08:00
rschaden
49d4079065 add email validation to invitations 2012-11-25 14:25:20 +01:00
Jonne Haß
b2606bc8c8 givup on installing FF16, just allow cucumber to fail until FF17 is supported 2012-11-24 10:35:07 +01:00
Jonne Haß
23cc8a806a we really need a new selenium release... 2012-11-24 10:26:56 +01:00
Jonne Haß
19ac3bc45c install libnotify4 too 2012-11-23 01:00:21 +01:00
Jonne Haß
0f6aab9593 giving up on apt, just download the right firefox deb 2012-11-23 00:57:24 +01:00
Jonne Haß
3b05490306 maybe that's a correct ff package version 2012-11-22 23:56:31 +01:00
Jonne Haß
1146421f83 maybe ff 16.0.2 is installable? 2012-11-22 23:45:45 +01:00
Jonne Haß
e8a7f40970 attempt to install ff 16 until there's a new selenium release 2012-11-22 23:42:08 +01:00
Jonne Haß
cb785195c9 update changelog for #3759 2012-11-22 21:19:16 +01:00
Jonne Haß
8b4b893c63 Merge pull request #3759 from bobbyw/feature/3750-last-post-link
Fix #3750
2012-11-22 12:16:42 -08:00
Jonne Haß
e25ebe2098 lets see if this fixes anything about the randomly failing comments cuke, still no clue about the recent timeouts 2012-11-22 21:14:26 +01:00
Bobby Wilson
abd4e17daf Fix #3750 2012-11-22 13:00:47 -07:00
Jonne Haß
76bd782962 bump recommended ruby version to 1.9.3-p327 since it fixes a potential DoS attack 2012-11-22 20:17:00 +01:00
Jonne Haß
e38345bb1c bump debugger-ruby_core_source 2012-11-22 20:11:11 +01:00
Jonne Haß
bbad82c5d2 this should restore compatibillity with ruby below 1.9.3-p125, not sure if we should hotfix this, if anyone wants to... 2012-11-22 20:04:19 +01:00
Jonne Haß
6ccdb40f6f update changelog [ci skip] 2012-11-22 10:37:30 +01:00
Jonne Haß
c59bb35087 Merge pull request #3754 from marpo60/housekeeping
Housekeeping2
2012-11-22 01:06:30 -08:00
Jonne Haß
5f6e03cfe5 Merge pull request #3714 from marpo60/refactor
Housekeeping
2012-11-22 01:06:05 -08:00
Fabián Rodríguez
be2db47f02 remove unnecesary stuff from specs 2012-11-21 18:26:17 -02:00
Fabián Rodríguez
99abc22403 remove unused methods 2012-11-21 18:26:17 -02:00
Fabián Rodríguez
232539cdf9 remove unused helpers 2012-11-21 18:26:17 -02:00
Jonne Haß
c5be6be377 bump rails to 3.2.9 2012-11-21 19:27:03 +01:00
Jonne Haß
71b5695b6e drop capistrano-ext, closes #3735 2012-11-21 19:18:43 +01:00
Jonne Haß
f1aeecc00b force typhoeus (and thus curl) to use diaspora.yml's CA bundle 2012-11-21 17:28:39 +01:00
Jonne Haß
60aa1ffe2e post release version bump [ci skip] 2012-11-20 22:02:54 +01:00
Florian Staudacher
442008657e changelog update before release 2012-11-20 19:12:42 +01:00
Florian Staudacher
742d320c0e Merge pull request #3739 from davecocoa/feature/3534-add-x-frame-header
add x-frame headers
2012-11-20 09:59:08 -08:00
Jonne Haß
1af49a0477 updated 78 locale files [ci skip] 2012-11-20 18:54:27 +01:00
Sean Tilley
a5050273ca Merge pull request #3727 from jaywink/feature/2321-fix-message-notifications
Fix notifications for private messages between local users, fixes #2321
2012-11-19 13:48:17 -08:00
Jonne Haß
e9bccb8afe get rid of string concat of translatable strings in getting started 2012-11-18 17:24:43 +01:00
David McMullin
9678a1d4b2 add x-frame headers 2012-11-18 09:55:10 +00:00
Florian Staudacher
9723c4abc9 don't let the install script run as root user 2012-11-16 15:34:44 +01:00
Florian Staudacher
5066db9941 Merge pull request #3733 from marpo60/3682-fix-padlock-images
3682 fix padlock images
2012-11-15 14:07:53 -08:00
Fabián Rodríguez
f3134206e1 update changelog 2012-11-15 18:18:47 -02:00
Fabián Rodríguez
f590abb343 fix 3682, use correct image path for padlocks 2012-11-15 18:17:15 -02:00