Alexander Machehin
|
2b9434f346
|
Merge branch 'master' into 369-bootstrap
Conflicts:
Gemfile
Gemfile.lock
app/assets/javascripts/angular-new/models/build_list.js.erb
app/assets/javascripts/extra/build_list.js
app/controllers/projects/build_lists_controller.rb
app/controllers/projects/projects_controller.rb
app/models/platform.rb
app/views/projects/base/_layout.html.haml
app/views/projects/build_lists/_new_form.html.haml
app/views/projects/build_lists/show.html.haml
app/views/projects/git/base/_fork.html.haml
app/views/projects/git/commits/_commits.html.haml
config/locales/en.yml
config/locales/ru.yml
|
2014-10-16 16:41:29 +06:00 |
|
Alexander Machehin
|
f0fe50f033
|
fix a mass projects import
|
2014-10-06 18:10:45 +06:00 |
Vokhmin Alexey V
|
6f97b8dc15
|
#416: Handle ExcludeArch and ExclusiveArch tags
|
2014-07-23 02:43:50 +04:00 |
|
Alexander Machehin
|
66e21de2b7
|
[#369] add tree content pagination
|
2014-07-09 15:38:36 +06:00 |
|
Vokhmin Alexey V
|
4087f4c94a
|
#345: rollback changes
|
2014-03-27 01:12:56 +04:00 |
|
Alexander Machehin
|
2ee3ea93bd
|
[#345] remove deprecated dynamic finder methods
|
2014-03-18 19:58:51 +06:00 |
|
Vokhmin Alexey V
|
c672aaa0ec
|
#345: fixed some specs, etc
|
2014-03-18 00:18:46 +04:00 |
|
Alexander Machehin
|
0a7d5d22da
|
[#345] move lib/modules/models to app/models/concerns; small refactoring
|
2014-03-11 14:58:36 +06:00 |