George Vinogradov
|
1f07332892
|
[issue #428] Merge branch 'master' into 428-advisory
Conflicts:
app/controllers/projects/build_lists_controller.rb
config/routes.rb
db/schema.rb
|
2012-05-04 21:29:04 +04:00 |
Alexander Machehin
|
813afe53cf
|
[refs #90] minor interface changes
|
2012-05-04 23:13:41 +06:00 |
|
Alexander Machehin
|
c5731ff8dd
|
[refs #90] fixed merging errors
|
2012-05-04 16:56:11 +06:00 |
|
Alexander Machehin
|
178dbdc5f0
|
[refs #90] move files
|
2012-05-03 23:55:08 +06:00 |
|
Alexander Machehin
|
36b4ce2d99
|
Merge branch 'master' into 90-pull
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
|
2012-05-03 23:19:43 +06:00 |
Pavel Chipiga
|
2539ef4795
|
Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263
|
2012-05-02 12:18:07 +03:00 |