nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12080 commits 4 branches 0 tags 121 MiB
Commit graph

439 commits

Author SHA1 Message Date
Maxwell Salzberg
9e80639ee8 remove some unused gems 2012-05-22 11:03:58 -07:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Maxwell Salzberg
d069865c42 upgrade carrierwave to 0.6.2 2012-05-17 18:51:12 -07:00
Maxwell Salzberg
af1109dcf7 remove a couple more stray files we dont use anymore, and remove rest-client 2012-05-17 18:23:39 -07:00
Florian Staudacher
fd5aedeb01 updated webmock, hopefully fix cucumber 2012-05-18 00:21:04 +02:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
69d81951a5 wip 2012-05-17 14:55:22 -07:00
Maxwell Salzberg
b55c2ab956 update heroku san to be an official version 2012-05-17 14:27:51 -07: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
danielgrippi
ebbbf74489 add 1.9.3 back into the gemfile. LETS DO THIS [ci skip] 2012-05-15 17:19:28 -07:00
danielgrippi
fb0fa46613 whoops (gemfile) [ci skip] 2012-05-15 17:10:44 -07:00
danielgrippi
15eab43408 explicitly set ruby version in gemfile [ci skip] 2012-05-15 14:40:00 -07:00
danielgrippi
f9bc493581 remove 1.9.3 from heroku env [ci skip] 2012-05-15 14:26:42 -07:00
Maxwell Salzberg
e3ccbb3471 use a forked version of heroku_san until upstream updates; rake now freezes args which was causing probs 
'
 2012-05-15 13:13:23 -07:00
Maxwell Salzberg
89d72f7f1e most recent version of rails has a bug which causes conversations to break: see https://github.com/rails/rails/issues/6312 2012-05-14 21:53:36 -07:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Maxwell Salzberg
4d58940e51 update rails admin [ci skip] 2012-05-14 19:58:07 -07:00
Maxwell Salzberg
379df76118 Update to faraday-middleware, as faraday stack has been deprecated. 
Hopefully this will make REE happy in Travis
 2012-05-14 15:59:07 -07:00
Jonne Haß
f4d996d644 do not break non heroku setups/do not confront them with a useless cryptic error message/do not use bundler 1.2 features but lock 1.1 in the Gemfile 2012-05-13 17:03:33 +02:00
danielgrippi
bcadedc258 specify ruby 1.9.3 in bundler for heroku. this requires a Successfully installed bundler-1.2.0.pre 
1 gem installed
Installing ri documentation for bundler-1.2.0.pre...
Building YARD (yri) index for bundler-1.2.0.pre...
Installing RDoc documentation for bundler-1.2.0.pre... [ci skip]
 2012-05-12 23:49:25 -07:00
Steven Hancock
b16f309aca Upgrade Rails Admin to latest gem 
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
 2012-05-11 03:32:05 -07:00
Steven Hancock
4c644c336b Actually only load rails admin in production mode 
This is what I think 28f8db51e7 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. 😁

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
 2012-05-09 11:46:18 -07:00
Helge Rausch
6b3ba24705 cleaning up in the debugger corner 2012-05-09 08:13:30 +02:00
Helge Rausch
b71f380f5d Merge branch 'master' into debugger 
Conflicts:
	Gemfile.lock
 2012-05-09 07:58:45 +02:00
Maxwell Salzberg
ab981d4339 Merge pull request #3225 from stevenh512/refactor-emails 
Use Markerb for emails
 2012-05-08 10:02:13 -07:00
Maxwell Salzberg
00123c0ab2 update unicorn [ci skip] 2012-05-08 00:05:09 -07:00
Steven Hancock
56db268613 Use markerb for emails 
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB

This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
 2012-05-07 19:41:30 -07:00
Maxwell Salzberg
4b363548a2 update selenium-webdriver for ff12 2012-05-07 18:25:05 -07:00
Helge Rausch
7b3d921ace adding 'debugger' gem to Gemfile 
It fixes a lot of the issues ruby-debug19 has.
 2012-05-05 11:50:25 +02:00
Dennis Collinson
6fcba2dd4b preload javascript vars using gon 2012-05-04 15:17:32 -07:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked) 
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
 2012-05-01 18:02:25 -07:00
Kaushik
c7433d3f67 Updated acts-as-taggable-on gem. 2012-04-29 00:23:48 +05:30
danielgrippi
9bdc3c7207 fix heroku_san dep in gemfile [ci skip] 2012-04-26 13:55:29 -07:00
Maxwell Salzberg
fc61df49ce heroku_san only for 1.9 
it uses 1.9 hash syntax which makes 1.8 sad
 2012-04-25 23:06:17 -07:00
Dennis Collinson
e55073fdd4 temp reverting to prove max wrong. 
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"

This reverts commit 78bcb1c321.
 2012-04-24 16:45:25 -07:00
Dennis Collinson
78bcb1c321 killing rails admin to investigate if its what's causing boot and deploy to be so slow 2012-04-24 16:30:31 -07:00
Dennis Collinson
8cc5f86298 reverting some test env munging 
max isn't a princess
learn2git
learn2bash
lulz
 2012-04-19 14:59:33 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Maxwell Salzberg
672eb1674f use rails admin gem, not the smaller git repo. NOTE: I will delete diaspora/rails_admin_smaller in about a week to let people who pulled it get off of it 2012-04-17 10:20:52 -07:00
Maxwell Salzberg
a558f45f9d use shallow copy of rails_admin [ci skip] 2012-04-15 17:08:05 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass 
bootstrap-sass (w00t)
 2012-04-13 17:44:08 -07:00
Maxwell Salzberg
a1b4cae7b4 move jasmine back for now; dont want to deal with figuring it out 2012-04-13 10:13:48 -07:00
Maxwell Salzberg
d6f317af3d move debugger to proper group 2012-04-11 18:18:54 -07:00
danielgrippi
ffbc3aa241 update some gems [ci skip] 2012-04-11 12:48:50 -07:00
Steven Hancock
021cc99492 bootstrap-sass 
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
 2012-04-11 06:16:01 -07:00
Maxwell Salzberg
37c3c3a860 update jasmine and move it to the test/development group 
move jasmine to development and test env, update it
 2012-04-10 19:34:13 -07:00
Steven Hancock
39b0c2de11 Only load Asset Sync when S3 is configured 
I consider this a hack, it needs review so I won't push it straight
to the main repo. I tried putting the same code in an initializer but
that appears to be too late to properly initialize the asset_sync
engine.

See diaspora/diaspora#3102
 2012-04-04 04:19:37 -07:00
Maxwell Salzberg
8ef49586c3 update foreman 2012-04-03 23:02:16 -07:00