Dennis Schubert
201a3ec1cf
Merge branch 'stable' into develop
2015-07-16 03:11:25 +02:00
realtin
d0b290ea4d
refactor hash indentation and add double quotes
...
this is the suggested styling according to hound/pronto/rubocop
(#6192 )
2015-07-16 03:08:34 +02:00
zaziemo
c5a2334fbe
refactor tests to use let
...
instead of before blocks creating instance variables
pronto checked
#6192
2015-07-16 03:05:21 +02:00
zaziemo
56e0d3d57d
Remove one comment and change hash syntax
...
#6192
2015-07-16 03:05:20 +02:00
realtin
62b375bb8e
refactor test to use let
...
instead of instance variables
(#6192 )
2015-07-16 03:05:20 +02:00
zaziemo
e1e8856e8d
refactor more specs
2015-07-16 03:05:20 +02:00
zaziemo
e3fe375849
correct indentation and use new hash syntax
2015-07-16 03:05:20 +02:00
zaziemo
fccb5dae23
refactor test: replacing instance variables in before blocks, renaming variables for easier understanding, simplify test set up with less different comments, correct two tests
2015-07-16 03:04:41 +02:00
Jonne Haß
f257658e46
Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations""
...
This reverts commit 2c7848e3cb
2015-05-04 00:43:41 +02:00
Jonne Haß
2c7848e3cb
Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"
...
This reverts commit 096fa2ddbbf7d1105148
2015-05-04 00:36:27 +02:00
Marcelo Briones
6636a89118
Add participation counter
2015-04-11 14:41:17 -03:00
Marco Colli
eccab62e32
Allow user to enable / disable notifications for a post from stream #5350
2015-01-25 18:40:47 +01:00
Jonne Haß
777e3123d6
Try fetching missing parent of relayables
...
* Extract post fetching logic from Reshare into
its own module
* raise proper error message when fetching fails
* raise proper error message when parent is still missing
We can't skip fetch failures or missing parents and
still need to retry them in case we're sent the parent
later on
2014-09-07 10:47:47 +02:00
khall
c42916df27
Two tests failing after rspec 2.99 => 3.0.0
2014-08-26 17:10:26 -07:00
khall
027bb9fcb0
Rspec version bump to 2.99
2014-08-26 17:00:21 -07:00
Jonne Haß
58d1448085
update factory girl
2012-09-12 13:24:23 +02:00
Maxwell Salzberg
b124d3e5a1
Revert "update factory girl" new version does not support 1.8.7 :(
...
This reverts commit c52342b7cb
2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb
update factory girl
2012-05-16 17:17:14 -07:00
Sarah Mei
085d6552b3
Drop comments, likes, and PMs from people who the (post/conversation) owner is ignoring.
2012-02-01 17:52:11 -08:00
danielgrippi
02021584a7
EvilQuery for Participation, refactor comment creation
...
you can now create a comment with User#comment!(post, text)
2012-02-01 15:09:31 -08:00
Maxwell Salzberg
49f18d435a
upgrade factory girl there are 3 failing cukes.
2012-01-21 21:58:50 -08:00
Maxwell Salzberg
2282fd35d1
kill no longer used youtube titles code with fire
2011-12-08 16:16:57 -08:00
danielgrippi
c9f069d000
Revert "add participant_users to conversations"
...
This reverts commit 655558cb95f85a047f6fcde12ec232a552fc80c02c12b94e677417801886abd211ba72
2011-11-05 18:08:32 -07:00
Maxwell Salzberg
a552fc80c0
fix small commenting email bug #oops
2011-11-04 19:24:48 -07:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Maxwell Salzberg
adaefd0cb5
MS DG rspec is green update gemfile
2011-09-13 13:34:49 -07:00
danielgrippi
1d0bec11f7
Add counter cache for comments on posts
2011-09-11 15:02:24 -07:00
Sarah Mei
b6e2e9452f
Fix YouTube titles on 1.9. (SIGH.)
2011-08-30 21:04:29 -07:00
Raphael Sofaer
d0ce257107
Revert "Revert "Merge branch 'hashtags-in-comments'""
...
This reverts commit d2e26f6937
2011-07-07 15:10:04 -07:00
danielgrippi
d2e26f6937
Revert "Merge branch 'hashtags-in-comments'"
...
This reverts commit f85d5ad6d4b8d70393f4
2011-07-07 13:39:15 -07:00
danielgrippi
310b9969f3
hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here...
2011-07-07 12:21:57 -07:00
Raphael Sofaer
df04b59857
Change :on to :post in the comment and post methods
2011-06-01 16:45:29 -07:00
Raphael Sofaer
537de1ce4c
build_like and build_comment now take only an options hash, and call build_relayable
2011-05-31 12:27:58 -07:00
Arzumy MD
cdf94a0275
#1019 comment/post handles multiple youtube links properly
2011-05-05 00:05:59 +08:00
Raphael Sofaer
4b4654a408
Changing message to text, partway done, deleted data conversion
2011-03-14 11:39:31 -07:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -08:00
danielvincent
11309574cf
messages are now relayable, a comment has an author as opposed to a person.
2011-03-01 12:39:42 -08:00
danielvincent
c62e9db397
private messages wip
2011-03-01 12:28:34 -08:00
danielvincent
f4e6d0d82b
broke out some comment logic to a replayable module
2011-03-01 12:28:33 -08:00
Raphael Sofaer
1c1fba63e7
Refactor notification to have subclasses, just a start
2011-03-01 10:30:29 -08:00
Sarah Mei
40fa91ead9
Start refactor of comment_spec.
2011-02-24 20:46:05 -08:00
danielvincent
3dd2384458
Merge branch 'fixturebuilder'
...
Conflicts:
spec/controllers/people_controller_spec.rb
spec/controllers/publics_controller_spec.rb
spec/lib/diaspora/parser_spec.rb
2011-01-18 17:05:44 -08:00
zhitomirskiyi
ef1b7644f3
got rid of more hash from
2011-01-18 16:38:31 -08:00
Raphael
1353929d44
Made specs work with fixtures, spec_helper needs work
2011-01-18 13:31:10 -08:00
Raphael
bd4efe8c2d
Escape youtube titles
2011-01-17 15:39:46 -08:00
Raphael
738e8c65c8
Merge almost complete, 4 failures
2011-01-14 16:00:10 -08:00
maxwell
25f388d903
MS DG made receive encapsulated in an object
2011-01-11 14:23:19 -08:00
zhitomirskiyi
3fae950905
also commented notification and sending ids into resque so that it works
2011-01-06 15:56:03 -08:00
maxwell
a7d651236f
make the postman work across everything. remove lots of now useless methods
2011-01-05 17:44:08 -08:00
maxwell
8819d288c4
i am greeen
2011-01-05 17:43:25 -08:00
