Commit Graph

6968 Commits

Author SHA1 Message Date
Alexander Machehin 692ffa9dc4 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/controllers/application_controller.rb
2015-02-02 23:38:48 +05:00
Alexander Machehin c583e6bcef [abf/abf-ideas#155] remove redirect when rendering error pages 2015-02-02 23:37:55 +05:00
Alexander Machehin 56fb9016ab remove redirect when render error page 2015-02-02 23:23:47 +05:00
Alexander Machehin bfeb3c218b [#369] fix specs 2015-02-02 23:21:43 +05:00
Alexander Machehin 79dbe762e5 [#369] fix double render 2015-02-02 23:21:28 +05:00
Alexander Machehin fb438e3c75 remove redirect when render error page 2015-02-02 23:20:45 +05:00
Alexander Machehin cf39b3911c [#369] pull request: new page 2015-02-02 20:44:57 +05:00
Alexander Machehin 0692c026f1 [#369] update grid for big pages 2015-01-29 13:31:32 +05:00
Alexander Machehin dd709bd5e9 [#369] change grid activity page + flashes 2015-01-28 17:16:22 +05:00
avm 481662b9f9 Merge pull request #450 from abf/rosa-build:446-change_alias_abilities
#446 Only admin can share a project
2015-01-27 19:19:00 +04:00
Alexander Machehin e2a1996883 [#369] blame, blob edit pages 2015-01-27 20:17:15 +05:00
Alexander Machehin 650cc8d34d [#446] remove old ability 2015-01-26 19:45:50 +05:00
Alexander Machehin c3ea0cd259 fix "This dynamic method is deprecated" 2015-01-26 18:52:48 +05:00
Alexander Machehin dc2e0114b0 [#446] only admin can share a project 2015-01-26 18:52:09 +05:00
Alexander Machehin 4daa857f2c Merge branch 'master' into 369-bootstrap 2015-01-22 15:22:26 +05:00
Alexander Machehin c71e05ad3c [#369] remove detecting renames from a diff stats method 2015-01-22 15:22:01 +05:00
Alexander Machehin daaa390ed4 Merge branch '369-bootstrap' of abf.rosalinux.ru:abf/rosa-build into 369-bootstrap 2015-01-20 18:41:26 +05:00
Alexander Machehin 33fd426afb [#369] pull request: diff tab 2015-01-20 18:40:52 +05:00
avokhmin 6bcb86fce9 Merge pull request #447 from abf/rosa-build:446-project-aliases
#446: Project aliases
2015-01-17 00:34:54 +04:00
Alexander Machehin ec285dae39 [#369] pull requests: show images 2015-01-16 00:56:30 +05:00
Alexander Machehin 30fab8f2be [#369] pull requests: collapse header list 2015-01-16 00:26:03 +05:00
Alexander Machehin 45bad1afc1 [#369] pull requests: comments; in progress 2015-01-15 23:20:50 +05:00
Vokhmin Alexey V 3239cf388e #446: updated #destroy_git_repo, added specs 2015-01-15 00:05:57 +03:00
Vokhmin Alexey V cba5ff2d5e #446: cleanup, added specs for Project#fork 2015-01-14 23:56:26 +03:00
Alexander Machehin fbae733b89 [#369] pull requests: commits; in progress 2015-01-15 00:36:27 +05:00
Alexander Machehin 7c0a8b7743 [#369] fix zeroclipboad 2015-01-14 17:07:32 +05:00
Alexander Machehin 351f12eab2 Updated project.ru.yml 2015-01-14 06:50:45 +04:00
Vokhmin Alexey V 8cd175c840 #446: updated UI, logic 2015-01-14 02:17:23 +03:00
Vokhmin Alexey V fe8d24eb99 #446: added comments 2015-01-13 02:16:46 +03:00
Vokhmin Alexey V 8580b9a80d #446: added ability to create project aliases 2015-01-13 02:06:33 +03:00
Alexander Machehin 442b7f92dd [#369] pull request page: small fixes 2014-12-25 23:29:04 +05:00
Alexander Machehin 2ebb00cee2 [#369] fix new comment header 2014-12-25 19:45:57 +05:00
Alexander Machehin 92bb6dcd08 fix mistype 2014-12-25 19:45:36 +05:00
Alexander Machehin 7d600170a3 [#369] fix scroller 2014-12-25 19:45:11 +05:00
Alexander Machehin 3f7457e278 [#369] pull page: small status button fix 2014-12-25 19:44:44 +05:00
Alexander Machehin 6215d14657 [#369] issue page: fix undefined method 'id' for nil:NilClass 2014-12-25 18:30:45 +05:00
Alexander Machehin c4ddc0118d [#369] add scroller 2014-12-25 18:29:43 +05:00
Alexander Machehin b42766beb4 [#369] pull request page; some fixes, work in progress; 2014-12-25 01:14:03 +05:00
Alexander Machehin a37616b352 [#369] pull request page; in progress 2014-12-24 23:41:13 +05:00
avm dc2532c9bc Merge pull request #445 from abf/rosa-build:update-access-rights-for-create-product-build-lists
Add ability for project writers for create ProductBuildList
2014-12-24 14:37:53 +04:00
Vokhmin Alexey V 5992427773 updated comments 2014-12-24 00:59:08 +03:00
Vokhmin Alexey V 9b9137801b Added ability for project writer to create ProductBuildList 2014-12-24 00:56:30 +03:00
Alexander Machehin 8c061c19a6 [#369] pull request: diff tab 2014-12-23 22:49:00 +05:00
avm 1155a74103 Merge pull request #444 from abf/rosa-build:api-package-dependent-projects
Add dependent_projects into package
2014-12-23 15:58:10 +04:00
Alexander Machehin 28c9e9e65b Updated show.json.jbuilder 2014-12-23 12:22:06 +04:00
Vokhmin Alexey V df0de4d0ec added dependent_projects into API 2014-12-23 00:58:19 +03:00
Alexander Machehin 466993f097 [#369] pull request: commits page 2014-12-22 23:14:43 +05:00
Alexander Machehin 7e0bd19c1d [#369] pull request: discussion page 2014-12-22 15:54:40 +05:00
Alexander Machehin ab0a57d6b2 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/models/build_list.rb
	app/models/build_list/package.rb
	app/models/build_script.rb
	app/models/product_build_list.rb
	app/models/project_tag.rb
	app/views/projects/build_lists/_filter.html.haml
2014-12-18 15:07:27 +05:00
Alexander Machehin 9cc4e2d27c [#369] pull request page: discussion tab 2014-12-18 14:59:02 +05:00