Commit Graph

503 Commits

Author SHA1 Message Date
Marcin Kulik
38faf7e437 Use heroku style config (based on ENV) 2012-06-09 16:11:29 +02:00
Marcin Kulik
452a0f30d3 ENV[] > confstruct 2012-06-09 15:30:44 +02:00
Marcin Kulik
50428b9c66 Unicorn with girl_friday on Heroku 2012-06-09 15:25:43 +02:00
Marcin Kulik
a7c78bfb6e Heroku's Cedar stack has ruby 1.9.2 2012-06-09 13:12:27 +02:00
Marcin Kulik
dcd87fadcb Multi-interpreter, part 2 2012-06-08 09:18:02 +02:00
Marcin Kulik
3ac8693358 Merge branch 'rubinius18'
* rubinius18:
  Add puma to bundle
  Make it work on rubinius in 1.8 mode
  Use draper from git
  Don't use twitter bootstrap js bundle
  Update gem dependencies to work on rubinius

Conflicts:
	Gemfile
	Gemfile.lock
2012-06-08 09:12:46 +02:00
Marcin Kulik
69817d16f9 Multi-interpreter, part 1 2012-06-08 09:08:30 +02:00
Marcin Kulik
95cbc4a52f Merge branch 'master' into rubinius18
* master:
  Allow running in production mode on dev machine
  Fix UserMailer to work in 1.8 mode

Conflicts:
	app/views/layouts/application.html.erb
2012-06-08 00:56:00 +02:00
Marcin Kulik
6b53a25f0a Allow running in production mode on dev machine 2012-06-07 23:58:56 +02:00
Marcin Kulik
4b707884ab Fix UserMailer to work in 1.8 mode 2012-06-07 23:58:06 +02:00
Marcin Kulik
72526f3e1d Merge branch 'master' into rubinius
* master:
  Handle wider range of printable unicode characters
2012-06-07 21:58:19 +02:00
Marcin Kulik
ea11733882 Handle wider range of printable unicode characters 2012-06-07 21:57:40 +02:00
Marcin Kulik
2756cd99df Add puma to bundle 2012-06-07 21:46:37 +02:00
Marcin Kulik
056074ef04 Make it work on rubinius in 1.8 mode 2012-06-07 21:02:30 +02:00
Marcin Kulik
1ffb4f3012 Use draper from git 2012-06-07 19:17:06 +02:00
Marcin Kulik
e4a46fe45d Don't use twitter bootstrap js bundle 2012-06-07 19:16:38 +02:00
Marcin Kulik
ced3160883 Update gem dependencies to work on rubinius 2012-06-07 18:25:21 +02:00
Marcin Kulik
347068e064 Tests adjustments for girl_friday 2012-06-07 17:57:26 +02:00
Marcin Kulik
eb82eceb4e Get rid of sidekiq/capistrano integration 2012-06-07 17:53:00 +02:00
Marcin Kulik
f03881afb0 Don't set threadsafe!
It breaks tests
2012-06-07 17:51:43 +02:00
Marcin Kulik
31b82ad512 Use girl_friday for bg jobs 2012-06-07 17:35:43 +02:00
Marcin Kulik
6b3aae4a5c Ignore .rbx dir 2012-06-07 17:32:35 +02:00
Marcin Kulik
f8e79ffe6b Use ruby 1.8 syntax for hashes (rubinius/jruby) 2012-06-07 17:25:19 +02:00
Marcin Kulik
460aa7e50c Don't use require_relative 2012-06-07 17:24:45 +02:00
Marcin Kulik
00d2a6fcc6 Shell out to bzip2 instead of using bzip2-ruby 2012-06-05 00:29:24 +02:00
Marcin Kulik
7b33c31c70 Display snapshot for not started movie 2012-05-29 22:49:30 +02:00
Marcin Kulik
45d6683cd5 Line height in pixels is more stable 2012-05-29 21:28:25 +02:00
Marcin Kulik
458ca6e78b Use height + vertical margin instead of outerHeight for cellHeight 2012-05-29 20:59:57 +02:00
Marcin Kulik
bd96a8d722 A little smaller line height should be better though 2012-05-29 00:09:47 +02:00
Marcin Kulik
e67ec07562 Larger line-height 2012-05-28 22:10:31 +02:00
Marcin Kulik
6b39eac33f Fix word wrap for terminal pre element 2012-05-27 13:59:55 +02:00
Marcin Kulik
4bb69abdc7 Set proper player width in base renderer 2012-05-27 12:10:58 +02:00
Marcin Kulik
0e9287ea85 Improved setting of player width (fixes hud size) 2012-05-27 11:34:29 +02:00
Marcin Kulik
2814f92074 Fix escaping of HTML entities like &, < and > 2012-05-27 11:19:54 +02:00
Marcin Kulik
fae4a2c647 Have handlebars_assets in bugfix group 2012-05-27 11:19:22 +02:00
Marcin Kulik
d57f264f17 Properly set player width
Conflicts:

	app/assets/javascripts/player/renderers/pre.js.coffee
2012-05-27 10:27:03 +02:00
Marcin Kulik
49b7c39aac Handle aixterm color codes (90-97, 100-107) 2012-05-08 15:19:56 +02:00
Marcin Kulik
2d6a1e0670 Let's go with 1.9.3 2012-05-06 13:08:48 +02:00
Marcin Kulik
0e0a148cb9 Words 2012-05-06 02:02:36 +02:00
Marcin Kulik
40528ae84c script/cibuild should use script/setup 2012-05-06 01:57:07 +02:00
Marcin Kulik
c2b1c319c4 Setup script 2012-05-06 01:53:50 +02:00
Marcin Kulik
11473210af rbenv config 2012-05-06 01:53:32 +02:00
Marcin Kulik
ba97246db8 Time compression 2012-05-04 21:49:08 +02:00
Marcin Kulik
5afa98bb11 Better handling of 404s 2012-04-29 10:47:33 +02:00
Marcin Kulik
b84b5489c0 Make SnapshotWorker#cleanup not crash 2012-04-29 10:37:50 +02:00
Marcin Kulik
fc8677114d Again, better handling of UTF8 printing 2012-04-28 19:49:46 +02:00
Marcin Kulik
a406baf8f8 Use rvm-capistrano gem 2012-04-28 00:03:48 +02:00
Marcin Kulik
3c86965427 Improve regex for catching printable characters 2012-04-27 23:12:41 +02:00
Marcin Kulik
45e5af4492 forward_agent for capistrano 2012-04-27 12:28:42 +02:00
Marcin Kulik
0d77b843d3 adjustFrameWaitTime in Movie#stop 2012-04-15 21:11:25 +02:00