OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ba2ccb
)
change ignore
author
yasushiito
<yas@pen-chan.jp>
Tue, 30 Oct 2012 07:49:35 +0000
(16:49 +0900)
committer
yasushiito
<yas@pen-chan.jp>
Tue, 30 Oct 2012 07:49:35 +0000
(16:49 +0900)
.gitignore
patch
|
blob
|
history
Gemfile.lock
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index
7d019e6
..
e4e9cd8
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-3,6
+3,7
@@
db/*.sqlite3
db/schema.rb
log/*.log
tmp/
db/schema.rb
log/*.log
tmp/
+Gemfile.lock
.sass-cache/
public/image/*
config/aws.yaml
.sass-cache/
public/image/*
config/aws.yaml
diff --git
a/Gemfile.lock
b/Gemfile.lock
index
0e4fe12
..
d2e35f4
100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-56,7
+56,7
@@
GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.
3.3
)
+ coffee-script-source (1.
4.0
)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@@
-97,17
+97,17
@@
GEM
multi_json (1.3.6)
nokogiri (1.5.5-x86-mingw32)
orm_adapter (0.0.7)
multi_json (1.3.6)
nokogiri (1.5.5-x86-mingw32)
orm_adapter (0.0.7)
- pettanr_creative_commons_v30_licenses (0.0.
3
)
+ pettanr_creative_commons_v30_licenses (0.0.
4
)
rails (~> 3.1.1)
rails (~> 3.1.1)
- pettanr_pettan_commons_v01_licenses (0.0.
4
)
+ pettanr_pettan_commons_v01_licenses (0.0.
5
)
rails (~> 3.1.1)
rails (~> 3.1.1)
- pettanr_pettan_protected_v01_licenses (0.0.
4
)
+ pettanr_pettan_protected_v01_licenses (0.0.
6
)
rails (~> 3.1.1)
rails (~> 3.1.1)
- pettanr_pettan_public_v01_licenses (0.0.
4
)
+ pettanr_pettan_public_v01_licenses (0.0.
6
)
rails (~> 3.1.1)
rails (~> 3.1.1)
- pettanr_public_domain_v01_licenses (0.0.
3
)
+ pettanr_public_domain_v01_licenses (0.0.
4
)
rails (~> 3.1.1)
rails (~> 3.1.1)
- pettanr_unknown_v01_licenses (0.0.
4
)
+ pettanr_unknown_v01_licenses (0.0.
5
)
rails (~> 3.1.1)
pg (0.14.1-x86-mingw32)
polyglot (0.3.3)
rails (~> 3.1.1)
pg (0.14.1-x86-mingw32)
polyglot (0.3.3)
@@
-178,10
+178,10
@@
GEM
therubyracer-heroku (0.8.1.pre3)
thor (0.14.6)
tilt (1.3.3)
therubyracer-heroku (0.8.1.pre3)
thor (0.14.6)
tilt (1.3.3)
- treetop (1.4.1
1
)
+ treetop (1.4.1
2
)
polyglot
polyglot (>= 0.3.1)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.3
3
)
+ tzinfo (0.3.3
4
)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)