Commit Graph

6041 Commits

Author SHA1 Message Date
Alexander Machehin 205905e0dd Merge branch 'master' into 369-remove_codemirror 2014-04-15 16:02:32 +06:00
avokhmin 3afcb46e8c Merge pull request #381 from abf/rosa-build:345-fix_compress_assets
#345 fix assets compressing
2014-04-15 13:54:58 +04:00
Alexander Machehin 5a9623645f [#369] add default pygments styles 2014-04-15 15:54:23 +06:00
Alexander Machehin 1aadcf02b9 [#345] fix compressing css & js 2014-04-15 15:40:07 +06:00
Alexander Machehin 176266622a [#369] remove old code 2014-04-15 15:36:36 +06:00
avokhmin be903e4f75 Merge pull request #380 from abf/rosa-build:345-fix_update_commit
#345 fix update commit
2014-04-15 13:19:13 +04:00
Alexander Machehin 015518d89c [#345] fix update commit 2014-04-15 15:14:58 +06:00
Alexander Machehin f23259775e [#369] remove codemirror; use pygments 2014-04-15 15:11:14 +06:00
Vokhmin Alexey V 5b734e3006 #376: added NodeInstruction 2014-04-15 01:32:25 +04:00
Vokhmin Alexey V b577cd2b60 Update puma 2.8.1 => 2.8.2 2014-04-14 14:09:08 +04:00
avokhmin fcffae475b Merge pull request #378 from abf/rosa-build:369-move_old_bootstrap
move old bootstrap
2014-04-14 13:09:10 +04:00
Vokhmin Alexey V 93c82fd873 Merge branch 'master' into 369-move_old_bootstrap 2014-04-14 12:23:16 +04:00
avokhmin 9266d5b917 Merge pull request #377 from abf/rosa-build:use-active-admin
ActiveAdmin integration
2014-04-14 12:16:54 +04:00
Alexander Machehin 0d5aa59c64 [#369] move old bootstrap; remove unneeded files 2014-04-12 09:43:41 +06:00
Alexander Machehin 0dbc69db50 add site title link to the root page 2014-04-12 09:18:04 +06:00
Vokhmin Alexey V f175505c43 Fixed: logout_link 2014-04-12 00:46:00 +04:00
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Vokhmin Alexey V 43fc57ec37 refactoring according to Alexander's comments 2014-04-11 00:09:02 +04:00
avokhmin 5102e8bd86 Merge pull request #375 from abf/rosa-build:performance-issue
Optimize query for /projects page
2014-04-10 22:37:09 +04:00
Vokhmin Alexey V fd13427794 Optimize query for /projects page 2014-04-10 20:59:15 +04:00
avokhmin 9be65de719 Merge pull request #374 from abf/rosa-build:373-cached-chroot
#373: Cached builds/build nodes
2014-04-10 01:25:26 +04:00
Vokhmin Alexey V be6bd727a6 Fixed: Assign container 2014-04-10 01:20:39 +04:00
Vokhmin Alexey V 4d0453b738 #373: cleanup 2014-04-10 00:07:36 +04:00
Vokhmin Alexey V c65853e072 #373: added ability to destroy ProductBuildList 2014-04-09 22:44:19 +04:00
Vokhmin Alexey V 63b82433af Merge branch '373-cached-chroot' of abf.rosalinux.ru:abf/rosa-build into 373-cached-chroot 2014-04-09 12:54:09 +04:00
Vokhmin Alexey V 2ecf2c1d91 #373: rollback ability.rb 2014-04-09 12:53:53 +04:00
Alexander Machehin 659f13684b Merge branch '373-cached-chroot' of abf.rosalinux.ru:abf/rosa-build into 373-cached-chroot 2014-04-09 14:53:38 +06:00
Alexander Machehin a7bcb64968 Merge branch 'master' into 373-cached-chroot 2014-04-09 14:53:01 +06:00
Alexander Machehin 2aec96d989 Revert "fix authenticate_user method"
This reverts commit 0000487cf8.
2014-04-09 14:52:42 +06:00
Vokhmin Alexey V 8a2aa1f666 #373: remove validation for use_cached_chroot 2014-04-09 12:46:09 +04:00
Alexander Machehin ae889047ac Merge branch 'master' into 373-cached-chroot 2014-04-09 14:42:28 +06:00
Alexander Machehin 0000487cf8 fix authenticate_user method 2014-04-09 14:41:56 +06:00
Alexander Machehin 02a488a2f2 Merge branch 'master' into 373-cached-chroot 2014-04-09 12:43:33 +06:00
Alexander Machehin 80cd7bcd52 fix mistype with reset password token 2014-04-09 12:43:12 +06:00
Alexander Machehin 32b61dcf5d Merge branch 'master' into 373-cached-chroot 2014-04-09 12:28:32 +06:00
Alexander Machehin 09f14687ad fix edit password url 2014-04-09 12:28:02 +06:00
Vokhmin Alexey V 4a3068ce42 #373: misprint 2014-04-09 01:16:36 +04:00
Vokhmin Alexey V 35a2be81cf #373: rollback changes 2014-04-09 01:07:50 +04:00
Vokhmin Alexey V 55e8345b66 Merge branch 'master' into 373-cached-chroot 2014-04-09 00:29:05 +04:00
Vokhmin Alexey V 7842f72eb3 Fixed: Access violation to this page 2014-04-08 17:00:39 +04:00
Vokhmin Alexey V afb3b183c8 #373: rollback changes 2014-04-08 02:12:22 +04:00
Vokhmin Alexey V 6e584e1ec9 #373: cleanup 2014-04-08 01:56:13 +04:00
Vokhmin Alexey V 0bae4d30f8 #373: rollback changes 2014-04-08 01:54:12 +04:00
Vokhmin Alexey V 02d291a032 #373: send token to product_build_list 2014-04-08 01:51:21 +04:00
Vokhmin Alexey V 81c3f6aaa6 #373: rollback changes 2014-04-08 01:37:11 +04:00
Vokhmin Alexey V 7d0b2998dc #373: refactoring, added specs 2014-04-08 01:30:01 +04:00
Vokhmin Alexey V c41fc4d0bb #373: added use_cached_chroot field 2014-04-07 23:00:42 +04:00
avm 62e7c9a5e5 Merge pull request #372 from abf/rosa-build:clean-api-defender-statistics
Clean ApiDefender statistics
2014-04-07 17:43:28 +04:00
Vokhmin Alexey V 37be95b9ae Updated comments 2014-04-05 23:20:44 +04:00
Vokhmin Alexey V 773c1701ad Cleans ApiDefender statistics 2014-04-05 23:19:04 +04:00