##// END OF EJS Templates
Merged r14440 from trunk to 3.1-stable (#20292)...
Toshi MARUYAMA -
r14059:4e371042f9f8
parent child
Show More
@@ -1,41 +1,42
1 /.project
1 /.project
2 /.loadpath
2 /.loadpath
3 /.powrc
3 /.powrc
4 /.rvmrc
4 /.rvmrc
5 /config/additional_environment.rb
5 /config/additional_environment.rb
6 /config/configuration.yml
6 /config/configuration.yml
7 /config/database.yml
7 /config/database.yml
8 /config/email.yml
8 /config/email.yml
9 /config/secrets.yml
9 /config/initializers/session_store.rb
10 /config/initializers/session_store.rb
10 /config/initializers/secret_token.rb
11 /config/initializers/secret_token.rb
11 /coverage
12 /coverage
12 /db/*.db
13 /db/*.db
13 /db/*.sqlite3
14 /db/*.sqlite3
14 /db/schema.rb
15 /db/schema.rb
15 /files/*
16 /files/*
16 /lib/redmine/scm/adapters/mercurial/redminehelper.pyc
17 /lib/redmine/scm/adapters/mercurial/redminehelper.pyc
17 /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
18 /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
18 /log/*.log*
19 /log/*.log*
19 /log/mongrel_debug
20 /log/mongrel_debug
20 /plugins/*
21 /plugins/*
21 !/plugins/README
22 !/plugins/README
22 /public/dispatch.*
23 /public/dispatch.*
23 /public/plugin_assets/*
24 /public/plugin_assets/*
24 /public/themes/*
25 /public/themes/*
25 !/public/themes/alternate
26 !/public/themes/alternate
26 !/public/themes/classic
27 !/public/themes/classic
27 !/public/themes/README
28 !/public/themes/README
28 /tmp/*
29 /tmp/*
29 /tmp/cache/*
30 /tmp/cache/*
30 /tmp/pdf/*
31 /tmp/pdf/*
31 /tmp/sessions/*
32 /tmp/sessions/*
32 /tmp/sockets/*
33 /tmp/sockets/*
33 /tmp/test/*
34 /tmp/test/*
34 /tmp/thumbnails/*
35 /tmp/thumbnails/*
35 /vendor/cache
36 /vendor/cache
36 *.rbc
37 *.rbc
37
38
38 /.bundle
39 /.bundle
39 /Gemfile.lock
40 /Gemfile.lock
40 /Gemfile.local
41 /Gemfile.local
41
42
@@ -1,40 +1,41
1 syntax: glob
1 syntax: glob
2
2
3 .project
3 .project
4 .loadpath
4 .loadpath
5 .powrc
5 .powrc
6 .rvmrc
6 .rvmrc
7 config/additional_environment.rb
7 config/additional_environment.rb
8 config/configuration.yml
8 config/configuration.yml
9 config/database.yml
9 config/database.yml
10 config/email.yml
10 config/email.yml
11 config/secrets.yml
11 config/initializers/session_store.rb
12 config/initializers/session_store.rb
12 config/initializers/secret_token.rb
13 config/initializers/secret_token.rb
13 coverage
14 coverage
14 db/*.db
15 db/*.db
15 db/*.sqlite3
16 db/*.sqlite3
16 db/schema.rb
17 db/schema.rb
17 files/*
18 files/*
18 lib/redmine/scm/adapters/mercurial/redminehelper.pyc
19 lib/redmine/scm/adapters/mercurial/redminehelper.pyc
19 lib/redmine/scm/adapters/mercurial/redminehelper.pyo
20 lib/redmine/scm/adapters/mercurial/redminehelper.pyo
20 log/*.log*
21 log/*.log*
21 log/mongrel_debug
22 log/mongrel_debug
22 public/dispatch.*
23 public/dispatch.*
23 public/plugin_assets/*
24 public/plugin_assets/*
24 tmp/*
25 tmp/*
25 tmp/cache/*
26 tmp/cache/*
26 tmp/pdf/*
27 tmp/pdf/*
27 tmp/sessions/*
28 tmp/sessions/*
28 tmp/sockets/*
29 tmp/sockets/*
29 tmp/test/*
30 tmp/test/*
30 tmp/thumbnails/*
31 tmp/thumbnails/*
31 vendor/cache
32 vendor/cache
32 *.rbc
33 *.rbc
33
34
34 .svn/
35 .svn/
35 .git/
36 .git/
36
37
37 .bundle
38 .bundle
38 Gemfile.lock
39 Gemfile.lock
39 Gemfile.local
40 Gemfile.local
40
41
General Comments 0
You need to be logged in to leave comments. Login now