Jonne Haß
|
3e935e1104
|
use present to check if redis_url is empty
|
2012-09-12 22:30:08 +02:00 |
|
Jonne Haß
|
70a9218ea5
|
add thread_safe true to redis initialization because resque does it too now
|
2012-09-12 22:17:14 +02:00 |
|
Jonne Haß
|
3dbbbbe979
|
bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes
|
2012-09-12 21:22:34 +02:00 |
|
Jonne Haß
|
d9851b2368
|
bump yard
|
2012-09-12 17:19:28 +02:00 |
|
Jonne Haß
|
98ba8840c7
|
bump webmock
|
2012-09-12 17:14:06 +02:00 |
|
Jonne Haß
|
008651cb7e
|
bump factory_girl_rails
|
2012-09-12 17:11:25 +02:00 |
|
Jonne Haß
|
76edd7bf7b
|
bump acts_as_api
|
2012-09-12 17:10:27 +02:00 |
|
Jonne Haß
|
98c9862b19
|
update .rvmrc to point to the same releases travis is currently using
|
2012-09-12 16:51:57 +02:00 |
|
Jonne Haß
|
57c77fcd0a
|
bump nokogiri
|
2012-09-12 16:11:30 +02:00 |
|
Jonne Haß
|
97e05b62ea
|
lock gems for more safety
|
2012-09-12 15:24:09 +02:00 |
|
Jonne Haß
|
090d6022bd
|
Merge pull request #3566 from MrZYX/cleanup_gemfile
remove ruby-debug and all other MRI 1.8 related stuff from Gemfile
|
2012-09-12 06:14:38 -07:00 |
|
Jonne Haß
|
358ed79f99
|
Merge branch 'update_devise'
Conflicts:
Gemfile.lock
|
2012-09-12 15:11:34 +02:00 |
|
Jonne Haß
|
b00c7c1670
|
Merge pull request #3548 from diaspora/update_factory_girl
update factory girl
|
2012-09-12 05:34:41 -07:00 |
|
Jonne Haß
|
142e38e78b
|
update devise
|
2012-09-12 13:29:57 +02:00 |
|
Jonne Haß
|
20a7e5570f
|
remove ruby-debug and all other MRI 1.8 related stuff from Gemfile
|
2012-09-12 13:26:21 +02:00 |
|
Jonne Haß
|
58d1448085
|
update factory girl
|
2012-09-12 13:24:23 +02:00 |
|
Jonne Haß
|
2de0213d6f
|
Revert "Removed a couple missed "new_styles" assets."
This reverts commit e323d6134e.
|
2012-09-12 12:55:57 +02:00 |
|
Jonne Haß
|
2b729059c9
|
was too long awake last commit, here are the files back we still need
|
2012-09-12 12:55:57 +02:00 |
|
Sean Tilley
|
719eeff56f
|
Merge pull request #3571 from hfase01/master
Removed a couple lines missed by new style removal. [ci skip]
|
2012-09-12 01:19:34 -07:00 |
|
Hans Fase
|
e323d6134e
|
Removed a couple missed "new_styles" assets.
|
2012-09-12 04:05:33 -04:00 |
|
Jonne Haß
|
7ec2f8f419
|
finish beta striping
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
|
2012-09-12 07:51:19 +02:00 |
|
Jonne Haß
|
ab0ad630df
|
strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep
|
2012-09-12 05:48:12 +02:00 |
|
Jonne Haß
|
ffde639f4d
|
Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora
|
2012-09-12 04:55:10 +02:00 |
|
Sean Tilley
|
49ea8c8563
|
Strip Beta Features
|
2012-09-11 21:52:53 -05:00 |
|
Florian Staudacher
|
4e1e0bcfed
|
Merge pull request #3565 from movilla/nsfw_freeze_position
With mobile click "show" in #nsfw-posts links to top of page Fix: #3564
|
2012-09-11 10:06:35 -07:00 |
|
Jonne Haß
|
51bde9bf66
|
updated 8 locale files [ci skip]
|
2012-09-11 18:40:54 +02:00 |
|
movilla
|
10eb26ad2d
|
With mobile click "show" in #nsfw-posts links to top of page Fix: #3564
|
2012-09-11 16:42:55 +02:00 |
|
Jonne Haß
|
d479ceea4f
|
Merge pull request #3550 from diaspora/update_gems
Update gems
|
2012-09-11 02:40:19 -07:00 |
|
Jonne Haß
|
8dab297d26
|
bump and convert back to gem release: acts-as-taggable-on
|
2012-09-11 00:46:37 +02:00 |
|
Jonne Haß
|
f22346a4ae
|
bump pg
|
2012-09-11 00:46:37 +02:00 |
|
Jonne Haß
|
de88463d33
|
bump gherkin
|
2012-09-11 00:46:37 +02:00 |
|
Jonne Haß
|
9c2f864bf9
|
bump rack-piwik
|
2012-09-11 00:46:37 +02:00 |
|
Jonne Haß
|
108673703c
|
bump rack-google-analytics
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
ab0143d18e
|
bump gon
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
0d925c0fed
|
bump haml
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
3886547bf1
|
bump rack-cors
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
04a5a787ba
|
bump timecop
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
bcbcdcee8e
|
bump uglifier
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
b8a3313a65
|
bump debugger
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
088446e86e
|
bump rspec-rails, remove deprecated rspec syntax
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
e7b1edbef7
|
bump database_cleaner
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
80153bf287
|
bump thin
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
39a5baa8c8
|
bump resque
|
2012-09-11 00:46:35 +02:00 |
|
Jonne Haß
|
29967d14e1
|
bump omniauth
|
2012-09-11 00:46:35 +02:00 |
|
Jonne Haß
|
d1987d62c4
|
bump heroku_san
|
2012-09-11 00:46:35 +02:00 |
|
Jonne Haß
|
72cfff77b9
|
bump fixture_builder
|
2012-09-11 00:46:32 +02:00 |
|
Jonne Haß
|
d5b4a76488
|
bump foreman
|
2012-09-10 23:55:52 +02:00 |
|
Jonne Haß
|
d9a9c5352a
|
bump foreigner
|
2012-09-10 23:55:52 +02:00 |
|
Florian Staudacher
|
04a17fd508
|
Merge pull request #3561 from movilla/NSFW_mobile_will_come_back
NSFW mobile come back
|
2012-09-10 13:08:51 -07:00 |
|
Jonne Haß
|
b68c4d6a0c
|
Merge pull request #3549 from diaspora/update_selenium
bump selenium-webdriver
|
2012-09-10 12:07:30 -07:00 |
|