Permalink
Browse files

Merge branch 'dev-branch' of github.com:filipeamoreira/filipemoreira.…

…com into dev-branch
  • Loading branch information...
2 parents a88d933 + 90e3418 commit 4155dc99154d076b5cf3e6caec8994ac7ecd2871 @filipeamoreira committed Mar 9, 2012
View
@@ -0,0 +1 @@
+filipemoreira
View
@@ -10,7 +10,8 @@ group :development do
gem 'haml', '>= 3.1'
gem 'compass', '>= 0.11'
gem 'rubypants'
- gem 'rb-fsevent'
+ # gem 'rb-fsevent'
+ gem 'rb-fsevent', :git => 'git://github.com/ttilley/rb-fsevent.git', :branch => 'pre-compiled-gem-one-off'
gem 'stringex'
gem 'liquid', '2.2.2'
end
View
@@ -1,3 +1,10 @@
+GIT
+ remote: git://github.com/ttilley/rb-fsevent.git
+ revision: f36a8cd01b49a6ce2a26d9e1083b5f6e6722c470
+ branch: pre-compiled-gem-one-off
+ specs:
+ rb-fsevent (0.4.3.1pre1)
+
GEM
remote: http://rubygems.org/
specs:
@@ -42,7 +49,6 @@ GEM
rubypython (>= 0.5.1)
rack (1.3.2)
rake (0.9.2)
- rb-fsevent (0.4.3.1)
rdiscount (1.6.8)
rest-client (1.6.7)
mime-types (>= 1.16)
@@ -73,7 +79,7 @@ DEPENDENCIES
pygments.rb
rack
rake
- rb-fsevent
+ rb-fsevent!
rdiscount
rubypants
sinatra (= 1.2.6)
View
@@ -4,7 +4,7 @@
<title><![CDATA[Freelance Web & Mobile Development]]></title>
<link href="http://filipemoreira.com/atom.xml" rel="self"/>
<link href="http://filipemoreira.com/"/>
- <updated>2012-02-01T07:47:42+01:00</updated>
+ <updated>2012-02-22T15:20:09+01:00</updated>
<id>http://filipemoreira.com/</id>
<author>
<name><![CDATA[Filipe Moreira]]></name>
@@ -4,7 +4,7 @@
<title><![CDATA[Category: MongoDB | Freelance Web & Mobile Development]]></title>
<link href="http://filipemoreira.com/blog/categories/mongodb/atom.xml" rel="self"/>
<link href="http://filipemoreira.com/"/>
- <updated>2012-02-01T07:47:42+01:00</updated>
+ <updated>2012-02-22T15:20:09+01:00</updated>
<id>http://filipemoreira.com/</id>
<author>
<name><![CDATA[Filipe Moreira]]></name>
@@ -4,7 +4,7 @@
<title><![CDATA[Category: Rails | Freelance Web & Mobile Development]]></title>
<link href="http://filipemoreira.com/blog/categories/rails/atom.xml" rel="self"/>
<link href="http://filipemoreira.com/"/>
- <updated>2012-02-01T07:47:42+01:00</updated>
+ <updated>2012-02-22T15:20:09+01:00</updated>
<id>http://filipemoreira.com/</id>
<author>
<name><![CDATA[Filipe Moreira]]></name>
@@ -4,7 +4,7 @@
<title><![CDATA[Category: Ruby | Freelance Web & Mobile Development]]></title>
<link href="http://filipemoreira.com/blog/categories/ruby/atom.xml" rel="self"/>
<link href="http://filipemoreira.com/"/>
- <updated>2012-02-01T07:47:42+01:00</updated>
+ <updated>2012-02-22T15:20:09+01:00</updated>
<id>http://filipemoreira.com/</id>
<author>
<name><![CDATA[Filipe Moreira]]></name>
@@ -97,7 +97,7 @@ <h2>Online Shop</h2>
</ul>
-<p><a href="http://jesushousebaltimorestore.org"><img src="/images/portfolio/jesushousebaltimorestore.jpg" alt="jesushousebaltimorestore.org" /></a></p>
+<p><a href="http://jesushousebaltimore.org"><img src="/images/portfolio/jesushousebaltimorestore.jpg" alt="jesushousebaltimore.org" /></a></p>
<h2>Corporate Intranet Application</h2>
View
@@ -2,40 +2,40 @@
<urlset xmlns='http://www.sitemaps.org/schemas/sitemap/0.9'>
<url>
<loc>http://filipemoreira.com/blog/2012/01/16/starting-on-the-blogging-path/</loc>
- <lastmod>2012-01-16T10:13:48+01:00</lastmod>
+ <lastmod>2012-02-22T15:09:06+01:00</lastmod>
</url>
<url>
<loc>http://filipemoreira.com/blog/2012/01/24/full-text-search-with-mongodb/</loc>
- <lastmod>2012-01-25T13:40:53+01:00</lastmod>
+ <lastmod>2012-02-22T15:09:06+01:00</lastmod>
</url>
<url>
<loc>
http://filipemoreira.com/blog/2012/02/01/routing-a-wordpress-blog-inside-a-rails-app/
</loc>
- <lastmod>2012-02-01T07:47:18+01:00</lastmod>
+ <lastmod>2012-02-22T15:09:06+01:00</lastmod>
</url>
<url>
<loc>http://filipemoreira.com/about/</loc>
- <lastmod>2012-02-01T07:44:14+01:00</lastmod>
+ <lastmod>2012-02-22T15:09:06+01:00</lastmod>
</url>
<url>
<loc>http://filipemoreira.com/blog/archives/</loc>
- <lastmod>2012-02-01T07:47:18+01:00</lastmod>
+ <lastmod>2012-02-22T15:09:06+01:00</lastmod>
</url>
<url>
<loc>http://filipemoreira.com/</loc>
- <lastmod>2012-02-01T07:47:18+01:00</lastmod>
+ <lastmod>2012-02-22T15:09:06+01:00</lastmod>
</url>
<url>
<loc>http://filipemoreira.com/portfolio/</loc>
- <lastmod>2012-01-24T13:05:25+01:00</lastmod>
+ <lastmod>2012-02-22T15:18:36+01:00</lastmod>
</url>
<url>
<loc>http://filipemoreira.com/projects/</loc>
- <lastmod>2012-01-22T22:17:13+01:00</lastmod>
+ <lastmod>2012-02-22T15:09:06+01:00</lastmod>
</url>
<url>
<loc>http://filipemoreira.com/work/</loc>
- <lastmod>2012-01-24T12:23:06+01:00</lastmod>
+ <lastmod>2012-02-22T15:18:19+01:00</lastmod>
</url>
</urlset>

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -97,7 +97,7 @@ <h2>Online Shop</h2>
</ul>
-<p><a href="http://jesushousebaltimorestore.org"><img src="/images/portfolio/jesushousebaltimorestore.jpg" alt="jesushousebaltimorestore.org" /></a></p>
+<p><a href="http://jesushousebaltimore.org"><img src="/images/portfolio/jesushousebaltimorestore.jpg" alt="jesushousebaltimore.org" /></a></p>
<h2>Corporate Intranet Application</h2>
@@ -0,0 +1,9 @@
+---
+layout: post
+title: "Using pry as an irb replacement"
+date: 2012-02-22 15:26
+comments: true
+categories: [Ruby, Rails, Irb, Pry]
+---
+
+Pry is a ...
@@ -17,7 +17,7 @@ Technologies:
* Javascript
* Mysql
-[![jesushousebaltimorestore.org](/images/portfolio/jesushousebaltimorestore.jpg)](http://jesushousebaltimorestore.org)
+[![jesushousebaltimore.org](/images/portfolio/jesushousebaltimorestore.jpg)](http://jesushousebaltimore.org)
## Corporate Intranet Application
@@ -17,7 +17,7 @@ Technologies:
* Javascript
* Mysql
-[![jesushousebaltimorestore.org](/images/portfolio/jesushousebaltimorestore.jpg)](http://jesushousebaltimorestore.org)
+[![jesushousebaltimore.org](/images/portfolio/jesushousebaltimorestore.jpg)](http://jesushousebaltimore.org)
## Corporate Intranet Application

0 comments on commit 4155dc9

Please sign in to comment.