Commit graph

41 commits

Author SHA1 Message Date
Sarah Mei
06cc99b19e git ignores mobile.css 2010-12-04 19:16:14 -08:00
Raphael
a85f47041a This file is generated by rake fixtures:users 2010-11-24 14:07:00 -05:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
Sarah Mei
e0c0d2036c add .redcar to .gitignore 2010-11-14 21:48:10 -08:00
maxwell
d66e986971 removing oauth keys 2010-10-25 17:41:58 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 1481056af2.
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'"
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
Raphael
ea36790e21 Add gzipped source.tar to gitignore 2010-10-19 14:06:57 -07:00
Raphael
a8e8480e94 Add vendor/bundle to gitignore 2010-10-15 14:14:32 -07:00
Raphael
fc8dc3f041 Add generated CSS to gitignore 2010-10-14 13:15:01 -07:00
Raphael
3274f109e5 Reorganize gitignore 2010-10-13 11:30:22 -07:00
Alec Leamas
6177362c4a Adding the ubuntu install package, initial version.
T
2010-10-12 21:22:49 +02:00
Alec Leamas
4aa851c5a8 Ignore stgit files all over the place 2010-10-10 16:38:01 +02:00
Sarah Mei
03a0031ddd .gitignore capybara output 2010-10-08 00:38:53 -06:00
Crimer
56ed245db0 MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku. 2010-10-07 14:29:17 +00:00
ilya
82455981b8 added fb_config to gitignore 2010-10-05 12:21:33 -07:00
danielvincent
a53d15f50a update gitignore 2010-09-29 17:45:36 -04:00
ilya
b823213c0d added a generate:secret_token task, and added an initializer to generate one if the file does not exist 2010-09-27 15:29:55 -07:00
Raphael
9d2ee2f961 Merge branch 'master' into HEAD 2010-09-24 15:50:48 -07:00
Raphael
3b4b4f4ed3 Add a couple things to gitignore 2010-09-24 15:35:18 -07:00
Guido Serra aka Zeph
53cda256e2 merged 2010-09-23 19:59:30 +02:00
ilya
020ff603bd terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml. 2010-09-21 16:59:06 -07:00
Guido Serra aka Zeph
3599161a4a osx files 2010-09-19 22:33:02 +02:00
Michael Nutt
ef2e393ac8 Add bin directory to gitignore 2010-09-16 03:08:33 -04:00
Raphael Sofaer
7334501f2b Bring Gemfile.lock back 2010-09-15 22:27:15 -07:00
Patrick Aljord
a38655bd33 ignore Gemfile.lock 2010-09-16 09:59:55 +08:00
Paul Rosania
1e7c6c1867 Ignore .rvmrc 2010-09-16 09:50:26 +08:00
maxwell
d271f10060 MS; i think this bundler thing works 2010-09-07 18:21:36 -07:00
maxwell
c8dc31bb5b MS adding gemfile lock back into this house 2010-09-07 18:06:18 -07:00
Raphael
a29a1bec3e Add some logging to comments 2010-08-26 11:07:26 -07:00
maxwell
20678060e7 selenium, ymls, a sample test 2010-08-19 15:44:23 -07:00
maxwell
6410b68ea4 added correct path to ignore for uploads 2010-07-21 14:31:08 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00
ilya
bb146820bf IZ RS, new Gemfile, ignoring the random_seed 2010-07-12 11:43:16 -07:00
maxwell
a02a833625 updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too 2010-07-10 00:32:58 -07:00
ilya
228d8820c8 checking in test keyring 2010-07-09 14:09:42 -04:00
ilya
a5db2cd231 Added keyrings to gitignore, symlinked to shared dir in cap scripts 2010-07-08 20:54:20 -04:00
Raphael Sofaer
178085b984 RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf 2010-06-18 17:33:43 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00