Commit Graph

1909 Commits

Author SHA1 Message Date
Vokhmin Alexey V de442480da #465: updated RepositoryPolicy 2015-04-07 23:06:27 +03:00
Vokhmin Alexey V 92f7efed34 #465: Updated some controllers, logic of polices 2015-04-07 23:06:27 +03:00
Vokhmin Alexey V fe2110902b #465: updated ProjectPolicy 2015-04-07 23:05:12 +03:00
Vokhmin Alexey V 6a7d6cb982 #465: updated views 2015-04-07 23:05:12 +03:00
Vokhmin Alexey V 4fec2213c8 #465: added pundit gem, wip... 2015-04-07 23:01:25 +03:00
Alexander Machehin 7669ea33f9 update the project collaborators page 2015-04-03 20:08:17 +05:00
Alexander Machehin e5deae8fdd fix error with regenerate params 2015-04-02 19:54:13 +05:00
Alexander Machehin 7afcc6fd7e fix Missing template pages/tour/abf-tour-project-description-1 with format json 2015-03-26 23:41:31 +05:00
Alexander Machehin 90a4d47bfb product build lists page: update server status & fix a status filter 2015-03-23 16:14:50 +05:00
Alexander Machehin 70ee7fd208 remove debug 2015-03-20 15:12:33 +05:00
Alexander Machehin dabab0561d use rails-assets-notifyjs gem from rails-assets.org 2015-03-20 15:07:35 +05:00
Alexander Machehin 5c8c6ed196 repository projects: ajax remove project + flash 2015-03-19 22:24:54 +05:00
Alexander Machehin 2175a898be fix preview 2015-03-17 23:27:11 +05:00
Vokhmin Alexey V 86e39e978c Fixed: undefined method #find_or_initialize_by_provider_and_uid 2015-03-11 14:37:10 +03:00
Vokhmin Alexey V 57b8761f1e Merge branch 'master' into rails-4.1.9 2015-03-11 01:37:55 +03:00
Alexander Machehin 4026b75784 [#446] aliased projects should have same default branch 2015-03-10 20:51:38 +05:00
Alexander Machehin d29fb8f39a feed improvements: in progress 2015-03-10 13:55:57 +05:00
Vokhmin Alexey V d6234ae758 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/controllers/projects/git/trees_controller.rb
2015-03-06 00:53:44 +03:00
Alexander Machehin 9e73646f91 add content type 2015-03-05 17:51:54 +05:00
Alexander Machehin 9f53a384db [#369] dont redirect to project if get an ajax request 2015-03-05 10:57:28 +05:00
Vokhmin Alexey V 84e7145d6d rename *_filter => *_action 2015-03-05 02:19:19 +03:00
Vokhmin Alexey V 5e5d3905e4 Update rails to 4.1.9 2015-03-05 02:09:50 +03:00
Vokhmin Alexey V 41d72ce87a Added build_completed_partially status for ProductBuildList 2015-03-04 00:04:37 +03:00
Alexander Machehin 114637596d autocomplete project by owner with name 2015-02-27 14:58:38 +05:00
Alexander Machehin fcd6d7ec2a fix pull requests API (creating a pull request from another project) 2015-02-26 15:14:42 +05:00
Vokhmin Alexey V 13cd263855 #456: add integration with Group#default_branch, specs 2015-02-20 01:03:04 +03:00
Vokhmin Alexey V 7efe8894ff Added ability to use specific branch for each platform 2015-02-18 01:33:58 +03:00
avokhmin 693c3f6660 Merge pull request #453 from abf/rosa-build:452-default-platforms
#452: Make it possible to hide specific platforms on the new build page
2015-02-12 03:23:55 +04:00
Alexander Machehin 516a7a3df9 [#369] project settings: fix a maintainer autocomplete 2015-02-11 15:32:55 +05:00
Vokhmin Alexey V 2a01474d03 #452: added "Builds settings" for user 2015-02-11 01:08:39 +03:00
Alexander Machehin a1fae2f1b1 [#369] new pull request: fix a 'To project' typehead 2015-02-10 16:57:16 +05:00
Vokhmin Alexey V 21ca8dae32 #369: init project version for ProductBuildList 2015-02-06 01:35:18 +03:00
Alexander Machehin 424927dd89 [#369] new pull: autoselect project 2015-02-04 23:33:24 +05:00
Alexander Machehin b245c2a808 [#446] alias api 2015-02-04 17:02:45 +05:00
Alexander Machehin f1daf3d146 add status to the error pages 2015-02-03 01:27:53 +05:00
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 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 dc2e0114b0 [#446] only admin can share a project 2015-01-26 18:52:09 +05:00
Vokhmin Alexey V cba5ff2d5e #446: cleanup, added specs for Project#fork 2015-01-14 23:56:26 +03:00
Vokhmin Alexey V 8cd175c840 #446: updated UI, logic 2015-01-14 02:17:23 +03:00
Vokhmin Alexey V 8580b9a80d #446: added ability to create project aliases 2015-01-13 02:06:33 +03:00
Alexander Machehin 6215d14657 [#369] issue page: fix undefined method 'id' for nil:NilClass 2014-12-25 18:30:45 +05:00
Alexander Machehin a37616b352 [#369] pull request page; in progress 2014-12-24 23:41:13 +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
Alexander Machehin c8db1109d3 build lists api: add new filters 2014-12-09 20:33:27 +05:00
Alexander Machehin 72992a5dcd fix error in api - get a list build lists for a project 2014-12-09 18:32:55 +05:00
Alexander Machehin 8d9ec48ff9 [#369] project issue page: comments and so on 2014-12-04 22:11:50 +05:00
Vokhmin Alexey V 676b703109 #369: Fixed: missed variables at recreate action 2014-12-02 01:44:11 +03:00
Alexander Machehin e21ce73e89 [#369] issue page: status, many fixes; remove old code 2014-12-02 01:34:16 +05:00
Alexander Machehin cad69483d0 [#369] show issue page: in progress 2014-11-28 23:36:24 +05:00
Alexander Machehin 85a9eb6484 [#369] new issue page; small fixes 2014-11-28 18:28:08 +05:00
Alexander Machehin 5a2c4896ad [#369] new issue page: labels; small fixes 2014-11-27 23:55:03 +05:00
Alexander Machehin 4ffa696ef3 [#369] fix project issues page 2014-11-27 16:23:17 +05:00
Alexander Machehin 975ae2e314 [#369] update a project issues/pull_requests page 2014-11-27 16:15:00 +05:00
Alexander Machehin c6c4a9628b [#369] update project pull requests page 2014-11-27 14:42:32 +05:00
Vokhmin Alexey V b57dbb1a90 #369: updated UI for PullRequests#index 2014-11-27 02:31:35 +03:00
Vokhmin Alexey V 5a8c3430e8 update a access rights for creation/build of build_lists 2014-11-26 23:27:54 +03:00
Alexander Machehin 40cdd40acf [#369] new issue title 2014-11-26 19:24:52 +05:00
Alexander Machehin 66efa2e3fc [#369] fix project issues page for an anonymous user 2014-11-25 15:05:33 +05:00
Vokhmin Alexey V 55fad54108 #369: fixed: undefined method id for nil:NilClass: 2014-11-25 01:19:29 +03:00
Vokhmin Alexey V e01a63a163 Merge branch '369-bootstrap' of abf.rosalinux.ru:abf/rosa-build into 369-bootstrap 2014-11-25 00:01:45 +03:00
Vokhmin Alexey V 9bd11c4ea7 rollback changes and fixed specs 2014-11-25 00:01:39 +03:00
Alexander Machehin 6358a0e87f [#369] project issues page: labels 2014-11-25 01:38:09 +05:00
Alexander Machehin 9dcd42425d [#369] project issues index page: labels filter 2014-11-21 16:26:21 +05:00
Alexander Machehin 577475da9d [#369] project issues page 2014-11-21 00:49:50 +05:00
Alexander Machehin 9113373ee1 Merge branch '369-bootstrap' of abf.rosalinux.ru:abf/rosa-build into 369-bootstrap 2014-11-20 22:41:05 +05:00
Alexander Machehin fdf60fb754 [#369] project issues page: in progress 2014-11-20 22:40:50 +05:00
Vokhmin Alexey V 753995581a #369: updated UI of WIKI 2014-11-20 01:51:49 +03:00
Vokhmin Alexey V d1116e70db #369: updated UI for mass import 2014-11-18 23:45:03 +03:00
Vokhmin Alexey V ec6aebfd5b #369: updated UI for search 2014-11-18 00:17:03 +03:00
Alexander Machehin 2a5ec70a6b [#369] project collaborators page: in progress 2014-11-15 01:36:39 +05:00
Vokhmin Alexey V 7c3ed1a5d2 #369: updated UI for tour 2014-11-14 02:48:45 +03:00
Vokhmin Alexey V 362477fadd #369: remove layouts/application.html.haml 2014-11-14 00:41:07 +03:00
Vokhmin Alexey V 09a1ab377f #369: updated UI for user and group profile 2014-11-14 00:19:18 +03:00
Vokhmin Alexey V 54d2c6f3c3 #369: updated submenu for user 2014-11-13 03:23:01 +03:00
Vokhmin Alexey V 6bf4576b34 #369: updated UI for User profile 2014-11-13 03:17:22 +03:00
Vokhmin Alexey V f360f83588 #369: updated UI for Groups#show 2014-11-13 00:11:42 +03:00
Alexander Machehin e4aeaee9aa [#369] project hook pages 2014-11-12 23:45:28 +05:00
Alexander Machehin f4eb6de8b0 [#369] project sections page 2014-11-12 22:30:27 +05:00
Alexander Machehin bc0b196319 [#369] edit project page 2014-11-12 22:07:39 +05:00
Vokhmin Alexey V 1b5e94a2e1 #369: updated UI for Groups::Members 2014-11-12 02:50:15 +03:00
Vokhmin Alexey V a905237777 Merge branch '369-bootstrap' of abf.rosalinux.ru:abf/rosa-build into 369-bootstrap 2014-11-11 22:43:14 +03:00
Vokhmin Alexey V 0b7e4a41ec #369: updated autocompletes 2014-11-11 22:43:01 +03:00
Alexander Machehin efbde056e0 [#369] new project page 2014-11-11 21:59:49 +05:00
Vokhmin Alexey V e605f068b6 #369: added bootstrap-typeahead 2014-11-11 01:21:48 +03:00
Alexander Machehin 27f3d371a6 [#369] blob; hightlight a line; 2014-11-10 23:46:44 +05:00
Vokhmin Alexey V 90f6bca72d Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile.lock
	app/models/concerns/feed/git.rb
	app/models/issue.rb
2014-11-08 01:09:32 +03:00
Vokhmin Alexey V 682de1ba81 #369: updated UI for Groups#edit 2014-11-07 01:24:33 +03:00
Vokhmin Alexey V 6a78ab4993 #369: updated UI for user settings, ssh_keys 2014-11-07 01:00:23 +03:00
Vokhmin Alexey V 16808549ab #369: updated UI for BuildListsController#dependent_projects 2014-11-06 23:34:16 +03:00
Alexander Machehin 8c8d86788c [#369] fix layout for a new build list page 2014-11-06 12:59:56 +05:00
Vokhmin Alexey V 0aefdc3dda #369: updated UI for Advisories#show 2014-11-06 00:11:02 +03:00
Alexander Machehin 5765279ec9 [#369] new build list page: clone a build list 2014-11-05 18:57:20 +05:00
Alexander Machehin d0ab09902c [#369] new build list page: add last build lists 2014-11-05 15:52:16 +05:00
Alexander Machehin 4efe951c6d [#369] platforms page: fix pagination, small refactoring 2014-10-31 15:19:41 +05:00
Vokhmin Alexey V 4193763a53 #369: cleanup 2014-10-31 03:11:42 +03:00
Vokhmin Alexey V 44ab14028d #369: cleanup, updated UI for creation of ProductBuildList 2014-10-31 03:09:20 +03:00
Vokhmin Alexey V fdd79aec07 #369: updated UI for ProductBuildListsController#show 2014-10-31 02:46:16 +03:00
Alexander Machehin 0114bb7a65 [#369] small refactoring 2014-10-30 23:10:12 +05:00
Alexander Machehin ded2c94d54 [#369] update repository projects pagination 2014-10-30 23:07:43 +05:00
Alexander Machehin 5b27309d21 [#369] update a platform content paginate 2014-10-30 22:30:39 +05:00
Vokhmin Alexey V db4948957c #369: updated UI of product_build_lists (#index) 2014-10-30 01:41:48 +03:00
Vokhmin Alexey V 0275305e33 #369: updated UI for Repositories, Products 2014-10-30 00:18:49 +03:00
Vokhmin Alexey V c3e8bff760 #369: updated UI for #show, #projects_list of Repository 2014-10-29 02:04:45 +03:00
Vokhmin Alexey V 1be09ee042 #369: updated simple_form styles 2014-10-28 22:20:23 +03:00
Vokhmin Alexey V 0cd7888469 #369: updated UI for MassBuilds (#index, #show actions) 2014-10-28 01:09:18 +03:00
Vokhmin Alexey V c505426d1f #369: updated UI for Tokens 2014-10-28 00:33:24 +03:00
Vokhmin Alexey V b4f6129951 #369: updated UI for KeyPairs 2014-10-28 00:22:35 +03:00
Vokhmin Alexey V 35c6dfd21b #369: updated UI for maintainers 2014-10-27 23:56:52 +03:00
Vokhmin Alexey V ea5a9c8b05 #369: updated UI for Contents, Clone, Advisories 2014-10-27 23:14:49 +03:00
Alexander Machehin e20b8b9e9d Merge branch '369-bootstrap-platforms' into 369-bootstrap 2014-10-25 13:34:08 +06:00
Alexander Machehin 9241ee83f1 [#369] new build list page small fixes 2014-10-25 13:29:34 +06:00
Vokhmin Alexey V 2bf34994a5 #369: added simple_form, updated #new, #edit actions for platform 2014-10-25 02:43:46 +04:00
Vokhmin Alexey V 1ae14ecd86 #369: use bootstrap for Platforms#show page 2014-10-24 03:27:30 +04:00
Alexander Machehin ca326c2db6 [#369] rebuilded a new build list page; work in progress 2014-10-23 14:46:49 +06:00
Vokhmin Alexey V f39c9e0bb5 #435: added filter by users and groups 2014-10-22 00:56:36 +04:00
Vokhmin Alexey V acd57203c7 #435: display statistics by issues and pull-requests 2014-10-20 23:18:34 +04:00
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
Vokhmin Alexey V 6c24a9dcf5 #435: cleanup 2014-10-14 23:34:42 +04:00
Vokhmin Alexey V 2a3afab06b #435: cleanup 2014-10-14 21:24:07 +04:00
Vokhmin Alexey V 7c8aeaaced #435: changes according to Alexander's comments 2014-10-14 21:17:39 +04:00
Vokhmin Alexey V 1b421e901f Merge branch 'master' into 435-activity-statistics 2014-10-14 00:27:08 +04:00
Vokhmin Alexey V 0f5e1f8548 #435: cleanup, refactoring, updated locales 2014-10-14 00:21:32 +04:00
Vokhmin Alexey V af7f9c6a15 #435: fetch data for BuildLists graph 2014-10-09 01:01:03 +04:00
Alexander Machehin 3aebca9f3b update rescue from the product log highlight 2014-10-08 19:03:09 +06:00
Alexander Machehin dbb1d19ac0 try to catch a MentosError error 2014-10-07 22:38:52 +06:00
Vokhmin Alexey V 5649e2e873 #435: added Statistic model 2014-10-06 23:16:12 +04:00
Alexander Machehin 89f322cd24 [#330] fix searh api 2014-09-30 18:50:59 +06:00
Alexander Machehin 92db8c7968 improve search 2014-09-30 18:08:45 +06:00
Vokhmin Alexey V 4310582596 #428: add save_buildroot to BuildList 2014-09-25 00:44:32 +04:00
Vokhmin Alexey V cedd9b8b28 refactorng, added extra condition into #next_build_from_queue 2014-09-19 01:29:01 +04:00
Vokhmin Alexey V 6b6cb02f0b Added filter by platforms and arches for tasks 2014-09-19 01:00:31 +04:00
Alexander Machehin e8e80e91fe fix Could not find a valid mapping for nil 2014-09-13 09:43:41 +06:00
Alexander Machehin d268bb7c99 platforms_for_build return hidden platforms
(use a availables_main_platforms method)
2014-09-10 17:26:08 +06:00
Alexander Machehin e5788a09c8 fix multiple renders 2014-09-10 14:53:39 +06:00
Alexander Machehin 4d495aca2e refactoring respond_to 2014-08-29 02:46:42 +06:00
Alexander Machehin 9ba87cd361 fix api ActionView::MissingTemplate 2014-08-29 02:22:11 +06:00
Alexander Machehin f3e6347fda small optimize 2014-08-28 23:13:38 +06:00
Alexander Machehin bf0a31dcdc fix TypeError: Cannot visit Project 2014-08-28 20:53:04 +06:00
Alexander Machehin 9a90283fcf add resque from ActionController::UnknownFormat exception 2014-08-28 20:15:18 +06:00
Alexander Machehin 872e3d9111 fix error "undefined method map for nil:NilClass" 2014-08-28 19:23:41 +06:00
Vokhmin Alexey V 9afa84e8de #418: Added page for creation of builds for dependent projects 2014-07-23 22:02:51 +04:00
Alexander Machehin 202ac91644 [#369] change location in the tree page 2014-07-11 15:43:45 +06:00
Alexander Machehin 3bbf6b54f2 [#369] tags page 2014-07-10 21:47:15 +06:00
Alexander Machehin 3b7bfb0c1d [#369] branches page 2014-07-10 21:13:23 +06:00
Alexander Machehin 0c1d0fc133 [#369] commits index page 2014-07-09 22:29:15 +06:00
Alexander Machehin 388617c248 [#369] git tree page 2014-07-08 20:52:10 +06:00
Alexander Machehin 33790f884c [#369] small improvements; project page 2014-07-01 20:52:52 +06:00
Vokhmin Alexey V de2d08946f #405: updated UI, added extra_mass_builds to MassBuild 2014-06-27 23:08:14 +04:00
Alexander Machehin 82d2d18a36 [#369] advisories page 2014-06-27 17:43:31 +06:00
Vokhmin Alexey V 02305124e0 #405: cleanup 2014-06-27 01:26:26 +04:00
Vokhmin Alexey V 7ded629ca6 #408: added description to MassBuild 2014-06-27 01:21:31 +04:00
Vokhmin Alexey V 790ea62670 #405: added ability to recreate mass builds 2014-06-26 23:51:21 +04:00
Vokhmin Alexey V 2c326e809e #408: added success list, refactoring 2014-06-26 21:20:26 +04:00
Alexander Machehin a74aa8789e [#369] groups page 2014-06-26 19:18:56 +06:00
Alexander Machehin bdcbcdd197 [#369] restore line 2014-06-26 18:16:35 +06:00
Alexander Machehin 2727380c32 [#369] projects page; small refactoring 2014-06-26 18:07:22 +06:00
Alexander Machehin bee3629593 [#369] not worked new build list page; platforms index page; small paginate refactoring 2014-06-24 15:03:08 +06:00
Vokhmin Alexey V 4a40764173 #403: move abf_worker/*_observer to app/jobs/abf_worker/ 2014-06-20 22:02:32 +04:00
Vokhmin Alexey V c37cf206ab #403: updated structure of jobs 2014-06-19 00:40:22 +04:00
Vokhmin Alexey V 4940073780 #397: added ability to run dependent projects 2014-06-16 23:26:14 +04:00
Alexander Machehin b20fa2bbc2 [#399] smarter selection of target project for pull requests 2014-06-10 17:31:15 +06:00
Alexander Machehin 4ba6506450 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/views/projects/build_lists/show.html.haml
	app/views/projects/build_lists/show.json.jbuilder
2014-06-10 13:13:32 +06:00
Alexander Machehin d9ed103504 [#369] fix disabled repositories checkboxes 2014-06-08 16:38:17 +06:00
Alexander Machehin 737d8c99f3 [#369] new build list page without js & last builds table 2014-06-06 14:01:13 +06:00
Vokhmin Alexey V d91ceab0a9 rename forbid_to_publish_builds_not_from field to publish_builds_only_from_branch 2014-06-02 20:49:50 +04:00
Alexander Machehin aa959496c9 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/views/projects/build_lists/show.html.haml
	app/views/shared/_build_results.html.haml
2014-06-02 19:46:58 +06:00
Vokhmin Alexey V c664f77737 allow pass forbid_to_publish_builds_not_from field 2014-05-30 16:53:46 +04:00
Vokhmin Alexey V 31e40a9360 #394: updated BuildListsController, RpmWorkerObserver, added specs 2014-05-29 01:08:29 +04:00
Alexander Machehin 77374a9be0 [#369] customize top menu; add submenu content 2014-05-28 19:14:15 +06:00
Alexander Machehin 7eb5b5e395 [#369] monitoring page; some fixes 2014-05-26 23:42:27 +06:00
Vokhmin Alexey V 0c5e8c012c #392: added use_extra_tests field to BuildList, MassBuild 2014-05-24 00:29:24 +04:00
Vokhmin Alexey V 5404a7e75a #390: added specs 2014-05-22 22:08:43 +04:00
Vokhmin Alexey V 90f921e038 #390: added ability to rerun tests 2014-05-22 02:58:13 +04:00
Vokhmin Alexey V 6694634d9b #388: added specs 2014-05-21 01:43:22 +04:00
Vokhmin Alexey V ea62617ed5 #388: Updated UI 2014-05-21 01:15:06 +04:00
Vokhmin Alexey V ac473294b7 #388: added angularjs controller 2014-05-17 01:53:04 +04:00
Vokhmin Alexey V 0d7c1eb4e1 #386: Added filter by group 2014-05-15 23:52:43 +04:00
Alexander Machehin ed21e0475b [#369] fix main page 2014-05-12 16:02:48 +06:00
Alexander Machehin e10965a95f [#369] fix error in the old code 2014-05-06 19:15:32 +06:00
Alexander Machehin 2ef938a389 [#369] refactoring; add pagination 2014-05-06 15:51:04 +06:00
Alexander Machehin 8d211e5a75 [#369] remove ngTable; update all issues table 2014-05-06 01:16:15 +06:00
Vokhmin Alexey V 518c87994c refactoring according to Alexander's comments 2014-05-05 18:50:12 +04:00
Vokhmin Alexey V acc9b522db Use FileStore for build scripts 2014-05-03 00:38:28 +04:00
Alexander Machehin 67031c06f8 Merge branch 'master' into 369-bootstrap
Conflicts:
	config/environments/production.rb
2014-04-21 15:16:30 +06:00
Vokhmin Alexey V 8cbfdcc12f Merge branch 'master' into 376-add-monitoring-tool 2014-04-18 00:34:02 +04:00
Vokhmin Alexey V 552e36cf72 #376: added monitoring tool 2014-04-15 22:08:43 +04:00
Alexander Machehin d66d9accaf Merge branch '369-remove_codemirror' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	vendor/assets/javascripts/old-codemirror.js
	vendor/assets/javascripts/old-codemirror/keymaps/emacs.js
	vendor/assets/javascripts/old-codemirror/keymaps/vim.js
	vendor/assets/javascripts/old-codemirror/modes/clike.js
	vendor/assets/javascripts/old-codemirror/modes/clojure.js
	vendor/assets/javascripts/old-codemirror/modes/coffeescript.js
	vendor/assets/javascripts/old-codemirror/modes/css.js
	vendor/assets/javascripts/old-codemirror/modes/diff.js
	vendor/assets/javascripts/old-codemirror/modes/gfm.js
	vendor/assets/javascripts/old-codemirror/modes/go.js
	vendor/assets/javascripts/old-codemirror/modes/groovy.js
	vendor/assets/javascripts/old-codemirror/modes/haskell.js
	vendor/assets/javascripts/old-codemirror/modes/htmlembedded.js
	vendor/assets/javascripts/old-codemirror/modes/htmlmixed.js
	vendor/assets/javascripts/old-codemirror/modes/javascript.js
	vendor/assets/javascripts/old-codemirror/modes/jinja2.js
	vendor/assets/javascripts/old-codemirror/modes/less.js
	vendor/assets/javascripts/old-codemirror/modes/lua.js
	vendor/assets/javascripts/old-codemirror/modes/markdown.js
	vendor/assets/javascripts/old-codemirror/modes/mysql.js
	vendor/assets/javascripts/old-codemirror/modes/ntriples.js
	vendor/assets/javascripts/old-codemirror/modes/pascal.js
	vendor/assets/javascripts/old-codemirror/modes/perl.js
	vendor/assets/javascripts/old-codemirror/modes/php.js
	vendor/assets/javascripts/old-codemirror/modes/plsql.js
	vendor/assets/javascripts/old-codemirror/modes/python.js
	vendor/assets/javascripts/old-codemirror/modes/r.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-changes.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-spec.js
	vendor/assets/javascripts/old-codemirror/modes/rst.js
	vendor/assets/javascripts/old-codemirror/modes/ruby.js
	vendor/assets/javascripts/old-codemirror/modes/rust.js
	vendor/assets/javascripts/old-codemirror/modes/scheme.js
	vendor/assets/javascripts/old-codemirror/modes/shell.js
	vendor/assets/javascripts/old-codemirror/modes/smalltalk.js
	vendor/assets/javascripts/old-codemirror/modes/sparql.js
	vendor/assets/javascripts/old-codemirror/modes/stex.js
	vendor/assets/javascripts/old-codemirror/modes/tiddlywiki.js
	vendor/assets/javascripts/old-codemirror/modes/velocity.js
	vendor/assets/javascripts/old-codemirror/modes/verilog.js
	vendor/assets/javascripts/old-codemirror/modes/xml.js
	vendor/assets/javascripts/old-codemirror/modes/xmlpure.js
	vendor/assets/javascripts/old-codemirror/modes/yaml.js
	vendor/assets/javascripts/old-codemirror/overlay.js
	vendor/assets/javascripts/old-codemirror/runmode.js
	vendor/assets/javascripts/vendor.js
	vendor/assets/stylesheets/old-codemirror.scss
	vendor/assets/stylesheets/old-codemirror/modes/diff.scss
	vendor/assets/stylesheets/old-codemirror/modes/rpm-spec.scss
	vendor/assets/stylesheets/old-codemirror/modes/tiddlywiki.scss
	vendor/assets/stylesheets/old-codemirror/themes/cobalt.scss
	vendor/assets/stylesheets/old-codemirror/themes/eclipse.scss
	vendor/assets/stylesheets/old-codemirror/themes/elegant.scss
	vendor/assets/stylesheets/old-codemirror/themes/monokai.scss
	vendor/assets/stylesheets/old-codemirror/themes/neat.scss
	vendor/assets/stylesheets/old-codemirror/themes/night.scss
	vendor/assets/stylesheets/old-codemirror/themes/rubyblue.scss
	vendor/assets/stylesheets/vendor.scss
2014-04-15 19:04:27 +06:00
Alexander Machehin 4872ba549f [#369] add pygments to the product build list log 2014-04-15 16:39:35 +06:00
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Alexander Machehin 1a1838a363 [#369] add templates; add codemirror 2014-04-11 14:57:00 +06: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
Alexander Machehin a7bcb64968 Merge branch 'master' into 373-cached-chroot 2014-04-09 14:53:01 +06:00