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

559 commits

Author SHA1 Message Date
Jonne Haß
882f5affcf bump database_cleaner 2012-11-11 13:23:24 +01:00
Jonne Haß
9d18724191 bump redcarpet 2012-11-11 13:23:23 +01:00
Jonne Haß
18e8b076c7 bump guard 2012-11-11 13:23:23 +01:00
Jonne Haß
598875f2e3 bump resque 2012-11-11 13:23:22 +01:00
Jonne Haß
7f60cd62bf bump webmock 2012-11-11 13:23:22 +01:00
Jonne Haß
5aed18a53f bump client_side_validations 2012-11-11 13:23:22 +01:00
Jonne Haß
653dd80d43 remove bundler from Gemfile 2012-11-11 13:23:22 +01:00
Jonne Haß
5df3295954 bump handlebars_assets 2012-11-11 13:23:21 +01:00
Jonne Haß
002c3c27fc bump foreman 2012-11-11 13:23:21 +01:00
Jonne Haß
02635a7f64 bump fuubar 2012-11-11 13:23:21 +01:00
Jonne Haß
945aa12b5c bump timecop 2012-11-11 13:23:21 +01:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
Jonne Haß
fdc5811e1e made hy available, temporarily switched to git release of rails-i18n to fix #3023 [ci skip] 2012-10-07 14:30:29 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620 
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
 2012-09-30 22:26:23 +02:00
Jonne Haß
4c8e08e608 bump omniauth-tumblr as tumblr made breaking api changes 2012-09-30 22:09:58 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
ac59a3fa7a rails_admin version that is no longer conflicting with client_side_validations was released 2012-09-26 18:55:06 +02:00
Jonne Haß
7ba092ae0b bump jquery-rails 2012-09-26 18:55:06 +02:00
Jonne Haß
d5be4d6e2b bump asset_sync 2012-09-26 18:55:06 +02:00
Jonne Haß
254d4fd335 bump heroku and fog 2012-09-26 18:55:06 +02:00
Jonne Haß
0560cedab0 bump activerecord-import 2012-09-26 18:55:06 +02:00
Jonne Haß
db11b9d214 Merge branch 'update_gems' into develop 2012-09-20 14:37:34 +02:00
Jonne Haß
70eda77395 bump timecop 2012-09-17 21:25:39 +02:00
Jonne Haß
6d74926b9f bump foreman 2012-09-15 14:09:32 +02:00
Jonne Haß
5fdbbe03ee bump faraday and faraday_middleware 2012-09-15 14:06:04 +02:00
Steven Hancock
ca719893dc Update bootstrap-sass to 2.1.0.0 2012-09-15 01:42:27 -07:00
Jonne Haß
bedb7d1e22 bump activerecord-import 2012-09-13 18:08:13 +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ß
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ß
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ß
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ß
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ß
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
Jonne Haß
d33bf10c56 bump selenium-webdriver 2012-09-07 02:35:17 +02:00
Jonne Haß
6780d83770 update to rails 3.2.6 2012-09-06 20:35:18 +02:00
Maxwell Salzberg
4cf27d4248 use a fork of rails admin due to default proc problem override use in rails admin 2012-08-28 00:23:11 -07:00
Maxwell Salzberg
67ee4b6a95 updating typhoeus as it seemed to break inter pod communication 2012-08-27 12:10:55 -07:00
Movilla
6782babafd update gem typhoeus 0.4.2 2012-08-14 17:24:36 +02:00
Steven Hancock
6344d43432 Update Cucumber and Selenium 
Attempting to appease the Travis Bot
 2012-06-18 16:30:13 -07:00
Steven Hancock
a2ccf685ca Update Rails to 3.2.6 2012-06-13 06:19:32 -07:00
Steven Hancock
dc2184724b Use https for git dependencies in the Gemfile 
This is useful if your development and/or production setup is behind
a firewall and you can't use `git://`. Followup to #3358
 2012-06-11 20:24:54 -07:00
wubwubwubcr3w
8e4e5545eb update heroku_san gem 2012-06-05 16:07:27 +02:00
Maxwell Salzberg
0975488964 possible rspec bug? 
updating from 2.9 ~> 2.10 causes
spec/controllers/publics_controller_spec.rb  to break.  Namely, it now
seems that the host_meta, and web finger actions now return successful
http codes, but have blank bodies. Running this code by hand shows that
the response bodies are indeed not  blank, as reported by rspec-rails
2.9.x
 2012-06-04 12:49:24 -07:00
Maxwell Salzberg
d62a2ffc78 according to rspec-rails docs, rspec-rails should be in both test and development groups. Also, remove some implied gems which are sucked in by rspec-rails 2012-06-03 23:45:49 -07:00
Maxwell Salzberg
89406b568e update a bunch of gems that DONT break the build 2012-06-03 23:34:10 -07:00
Maxwell Salzberg
80daa05817 update haml to get rid if weird escape_javascript bug 2012-05-31 23:10:34 -07:00
Maxwell Salzberg
4db207b3dd update to 3.2.5 2012-05-31 22:14:32 -07:00
Maxwell Salzberg
324e460cfb updating rails to 3.2.4 2012-05-31 15:34:26 -07:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Steven Hancock
c2bc7272fb Escape hashtags in emails 
Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
 2012-05-28 21:31:27 -07:00
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