Dennis Schubert
|
aac0a2582e
|
Merge branch 'stable' into develop
|
2015-05-12 04:00:12 +02:00 |
|
Steffen van Bergerem
|
40bb44eb96
|
Mobile: manage followed tags
closes #5945
|
2015-05-12 04:00:07 +02:00 |
|
Jonne Haß
|
890029b19e
|
Merge branch 'stable' into develop
|
2015-05-10 14:26:26 +02:00 |
|
Dennis Schubert
|
1a4e3cef48
|
Mute ActiveRecord::RecordInvalid due to ignores
closes #5943
|
2015-05-10 14:26:21 +02:00 |
|
Dennis Schubert
|
32f95a860c
|
We don't always have invalid record messages ... so log the exception message instead.
|
2015-05-10 14:25:50 +02:00 |
|
Dennis Schubert
|
3f3148af2c
|
Merge branch 'stable' into develop
|
2015-05-10 02:00:41 +02:00 |
|
Steffen van Bergerem
|
0c5443d543
|
Make js-routes use compact and camelcase function names
closes #5941
|
2015-05-10 02:00:30 +02:00 |
|
Steffen van Bergerem
|
1428369849
|
Mobile: Add button to follow/unfollow tags
|
2015-05-10 01:59:50 +02:00 |
|
Dennis Schubert
|
5477c7df96
|
Merge branch 'stable' into develop
|
2015-05-10 01:59:21 +02:00 |
|
Steffen van Bergerem
|
59e57c013b
|
Update jasmine-ajax
closes #5937
|
2015-05-10 01:59:17 +02:00 |
|
Jonne Haß
|
59e77675ce
|
Merge branch 'stable' into develop
|
2015-05-10 00:10:19 +02:00 |
|
Dennis Schubert
|
6273c2959a
|
Rescue from private objects sent to the public api
closes #5938
|
2015-05-10 00:10:12 +02:00 |
|
Dennis Schubert
|
915dee3c4b
|
Mute some ActiveRecord::RecordNotUnique exceptions
|
2015-05-10 00:09:25 +02:00 |
|
Dennis Schubert
|
300376a854
|
Merge branch 'stable' into develop
|
2015-05-09 23:49:05 +02:00 |
|
Steffen van Bergerem
|
05ec235ea3
|
Pass along current_user in ContactPresenter#full_hash_with_person
closes #5936
|
2015-05-09 23:48:59 +02:00 |
|
Dennis Schubert
|
bd9bce2a5f
|
Merge branch 'stable' into develop
|
2015-05-07 22:56:05 +02:00 |
|
Jonne Haß
|
60fb680572
|
bump hashie
closes #5925
|
2015-05-07 22:55:56 +02:00 |
|
Jonne Haß
|
729fc1a6bf
|
bump sprockets-rails
|
2015-05-07 22:55:37 +02:00 |
|
Jonne Haß
|
2240599f59
|
bump rack
|
2015-05-07 22:55:37 +02:00 |
|
Jonne Haß
|
5d9822056b
|
bump websocket
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
b702c80fb8
|
bump listen
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
e0116e268f
|
bump domain_name
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
11f4561ae5
|
bump childprocess
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
4cf681a538
|
bump rspec
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
1024b3b1f1
|
bump byebug
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
2634ea07a9
|
bump js-routes
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
487afed53e
|
bump webmock
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
70189f05f4
|
bump unicorn
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
a9519ede3d
|
bump twitter-text
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
147ea4e399
|
bump spring
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
fa24333ca1
|
bump rubocop
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
5a6f6c68cc
|
bump rack-cors
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
ac405dddeb
|
bump mini_magick
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
4f75205d9f
|
bump fog
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
5c6e20048a
|
bump entypo-rails
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
319edd70ad
|
bump backbone-on-rails
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
16562d6d36
|
bump autoprefixer-rails
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
55fdf51058
|
bump addressable
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
fc00e94afa
|
Merge branch 'stable' into develop
|
2015-05-07 22:30:47 +02:00 |
|
Jonne Haß
|
138551112b
|
Fix obtaining sidekiq log path
|
2015-05-07 22:30:07 +02:00 |
|
Jonne Haß
|
ddf1b6ea8b
|
Merge branch 'stable' into develop
|
2015-05-07 22:08:30 +02:00 |
|
Jonne Haß
|
f0d51e24b8
|
Fix invalid setting calls in config/unicorn.rb
* .present? is an AS extension that isn't loaded at this point
* single_process_mode is defined in environment, not at the toplevel
|
2015-05-07 22:07:22 +02:00 |
|
Dennis Schubert
|
b05d183f91
|
Merge branch 'stable' into develop
|
2015-05-07 04:10:28 +02:00 |
|
Steffen van Bergerem
|
06e6e1db78
|
Remove private post content of also commented mails
merges #5931
|
2015-05-07 04:10:21 +02:00 |
|
Dennis Schubert
|
642c4597e1
|
Merge branch 'stable' into develop
|
2015-05-07 04:03:57 +02:00 |
|
Jonne Haß
|
a7699c2a2c
|
Update configurate and enable missing key exceptions
closes #5934
|
2015-05-07 04:03:43 +02:00 |
|
Jonne Haß
|
4612937787
|
Merge branch 'stable' into develop
|
2015-05-06 23:56:23 +02:00 |
|
Jonne Haß
|
166a152dc0
|
Merge branch 'master' into stable
|
2015-05-06 23:53:52 +02:00 |
|
Jonne Haß
|
6c164fe236
|
Merge branch 'hotfix/0.5.0.1'
|
2015-05-06 23:52:54 +02:00 |
|
Jonne Haß
|
51918a798a
|
bump to 0.5.0.1
|
2015-05-06 23:52:40 +02:00 |
|