Steven Hancock
3547654e6a
Merge pull request #3372 from stevenh512/use_https
...
Use https for git dependencies in the Gemfile
Followup to #3358
2012-06-11 20:29:12 -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
Steven Hancock
cac744c0b0
Update Gemfile.lock
...
Somehow heroku_san was still locked at 3.0.1 :)
2012-06-11 20:23:21 -07:00
Steven Hancock
2b47848da9
Autoload needs a string, not a Pathname
...
fixes #3373
2012-06-11 15:11:05 -07:00
Maxwell Salzberg
c764bae345
Merge pull request #3371 from stevenh512/rails_root
...
Rails.root and File.join cleanup [ci skip]
2012-06-11 11:01:47 -07:00
Steven Hancock
a8de3a5a3f
Rails.root and File.join cleanup
...
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
2012-06-11 03:13:20 -07:00
Florian Staudacher
e021fd821d
Merge pull request #3362 from diaspora/non-public-error-page
...
show a "post is not public" message when visitor is not logged in
2012-06-11 02:35:48 -07:00
Adrián Chaves Fernández (Gallaecio)
994ece57f5
Updated Galician (gl) translation.
2012-06-10 12:57:09 +02:00
Maxwell Salzberg
6e39ffa3da
Merge pull request #3363 from fermionic/parent-signature-fails-with-leading-whitespace
...
strip comment text upon comment creation
2012-06-09 13:08:26 -07:00
Zach Prezkuta
9f6d84141c
fix incorrect comment on RSpec text
2012-06-09 09:34:06 -06:00
Zach Prezkuta
44e43158cc
add rspec test and make fix more rails-y
2012-06-08 22:51:16 -06:00
Zach Prezkuta
ed51f34ebb
strip comment text upon comment creation
2012-06-08 22:51:16 -06:00
Florian Staudacher
8ca39f5936
show a "post is not public" message when visitor is not logged in
...
and tries to access a show page of a non-public post
2012-06-07 22:16:37 +02:00
Florian Staudacher
09cf60f794
use File.join when it's already there
2012-06-07 21:19:41 +02:00
Maxwell Salzberg
260a116e87
Merge pull request #3358 from nsdevaraj/patch-1
...
Edited git to https for access behind firewalls [ci skip]
2012-06-07 10:53:12 -07:00
Maxwell Salzberg
a15b239c51
Merge pull request #3359 from wubwubwubcr3w/update_heroku_san
...
update heroku_san gem [ci skip]
2012-06-05 11:13:41 -07:00
Jonne Haß
46a01664bb
fix minor typo: eliminate double spaces [ci skip]
2012-06-05 19:07:44 +02:00
wubwubwubcr3w
8e4e5545eb
update heroku_san gem
2012-06-05 16:07:27 +02:00
Daniel Grippi
5b424e7d94
don't use quotes for chartbeat (it's picky) [ci skip]
2012-06-05 00:14:00 -07:00
Daniel Grippi
44f2b7ae44
Update master
2012-06-04 23:47:20 -07:00
N.S.Devaraj
94e5b4dc7b
Update master
2012-06-05 11:17:26 +05:30
Maxwell Salzberg
9cf946b20e
use a smaller thumb on the home stream
2012-06-04 15:19:05 -07:00
Maxwell Salzberg
9071540400
use pod name helper in emails
2012-06-04 14:04:39 -07:00
Maxwell Salzberg
1da029a22f
this stopped working because there is a new way to render views by default in spec_helper.rb
2012-06-04 12:49:24 -07:00
Maxwell Salzberg
304c33f19e
explicitly render_views in publics controller
2012-06-04 12:49:24 -07: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
ebf2543586
Merge pull request #3355 from diaspora/update-gems
...
update a bunch more unlocked gems [ci skip]
2012-06-04 00:12:54 -07:00
Maxwell Salzberg
b0eeb11464
update a bunch more unlocked gems
2012-06-03 23:52:20 -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
4eb95a1b6b
Merge pull request #3353 from SuperTux88/fix-reshare-link-border
...
remove border from reshare link [ci skip]
2012-06-03 23:09:22 -07:00
Maxwell Salzberg
5d79d1ad00
Merge pull request #3354 from dmorley/patch-17
...
allow interactions to be viewed on public posts when not logged in
2012-06-03 23:08:54 -07:00
David Morley
d3b5e330b3
allow interactions to be viewed on public posts when not logged in
2012-06-03 21:49:08 -03:00
Benjamin Neff
769836c221
remove border from reshare link
2012-06-03 18:42:55 +02:00
Maxwell Salzberg
64bf4a1f48
adding the ability to customize your open graph namespace
2012-06-01 17:31:34 -07:00
Maxwell Salzberg
36ebefeaad
Merge pull request #3342 from diaspora/update_rails
...
updating rails to 3.2.5
2012-06-01 14:15:04 -07:00
Jonne Haß
2773694ba3
minor spelling fix [ci skip]
2012-06-01 23:02:56 +02:00
danielgrippi
9bf60d178a
Revert "consolidate mixpanel streams by making Profile one page [ci skip]"
...
This reverts commit 5af37fd3da
2012-06-01 13:48:51 -07:00
danielgrippi
5af37fd3da
consolidate mixpanel streams by making Profile one page [ci skip]
2012-06-01 13:24:01 -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
018e513130
remove disable_with depreciation warning.
2012-05-31 22:35:07 -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
Maxwell Salzberg
cf6974b898
fix photo uploader loading image
2012-05-31 11:58:11 -07:00
Jonne Haß
0592eb025e
updated 14 locale files [ci skip]
2012-05-31 17:22:58 +02:00
danielgrippi
8e2657d26b
more instrumentation [ci skip]
2012-05-30 19:26:07 -07:00
danielgrippi
dac781cb4f
array woes. boo [ci skip]
2012-05-30 19:03:23 -07:00
Dennis Collinson
f3d1afcc96
memoize selected frame
2012-05-30 18:09:59 -07:00
Dennis Collinson
374ec73fa4
make it clearer which frame is active, and fixes for scrolling flow.
2012-05-30 18:06:12 -07:00
danielgrippi
1c81e4f587
app.track => app.instrument to be less confusing
2012-05-30 17:56:28 -07:00
