Commit Graph

497 Commits

Author SHA1 Message Date
Vokhmin Alexey V 93885af29a #354: updated UI 2014-02-18 23:16:23 +04:00
Alexander Machehin c9cbb46daf [#343] fix errors 2014-01-21 10:58:53 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Vokhmin Alexey V 98ca0641ff Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-15 22:12:52 +04:00
Vokhmin Alexey V a881dd73ca #339: small refactoring, checking ability to publish into repository on auto publishing 2014-01-14 22:42:35 +04:00
Alexander Machehin b0da168621 [#29] remove encode strings 2014-01-10 08:59:33 +06:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
Vokhmin Alexey V d04f276f1d updated concatenation operation 2013-12-30 20:08:42 +04:00
Vokhmin Alexey V 5d62264bbb [abf/abf-ideas#111] fill in input fields of extra parameters on recreation of build_list 2013-11-21 23:28:26 +04:00
Alexander Machehin 69cefd8764 [#325] fix forbidden for simple user 2013-11-20 17:33:48 +06:00
Alexander Machehin 6932420678 Merge branch 'master' into 325-fork_project_with_another_name
Conflicts:
	app/controllers/projects/projects_controller.rb
2013-11-19 17:18:30 +06:00
Alexander Machehin 188c3be355 [#325] add abibity to create fork with different name 2013-11-19 17:06:44 +06:00
Vokhmin Alexey V 19ff6288ce #321: added select_tag with repositories into Mass Import 2013-11-15 18:46:09 +04:00
Vokhmin Alexey V e538a3d5a6 #321: added debug info, some fixes 2013-11-15 01:26:05 +04:00
Vokhmin Alexey V dbf3f24b21 #321: added UI for mass_import 2013-11-14 02:01:12 +04:00
Vokhmin Alexey V 0cbd5b21e5 #316: added new statuses for BuildList 2013-11-01 21:11:59 +04:00
Alexander Machehin fbc00071b9 fix missing template 2013-10-02 20:21:16 +06:00
Vokhmin Alexey V afc136db9c #289: added global_id into build_list 2013-08-29 21:46:11 +04:00
Vokhmin Alexey V a51b1e0e9f #281: Show repodata creation logs 2013-08-27 19:43:30 +04:00
Vokhmin Alexey V 747b279f60 #267: fixed link to logs 2013-08-21 15:00:22 +04:00
Vokhmin Alexey V e7b750cc21 Merge branch 'master' into 258-removeBackboneJS 2013-08-08 18:11:03 +04:00
Alexander Machehin 068e38e6d9 [#242] fix creating build list 2013-08-08 18:49:33 +06:00
Vokhmin Alexey V ce5b24316b Merge branch 'master' into 258-removeBackboneJS 2013-08-08 12:54:46 +04:00
Vokhmin Alexey V b59c43b4bd #258: updated Project Collaborators 2013-08-07 22:54:42 +04:00
Alexander Machehin 3b8ed4ce40 [#242] dont create build list from another 2013-08-07 15:36:48 +06:00
Alexander Machehin 63cab38c7d [#242] remove old code 2013-08-06 20:20:59 +06:00
Alexander Machehin ec47e6f24b [#242] fixed repositories checkbox disabled attribute 2013-08-06 20:16:50 +06:00
Alexander Machehin 4185ed0a2b Merge branch 'master' into 242-restart_last_build_list
Conflicts:
	app/controllers/projects/build_lists_controller.rb
	config/routes.rb
2013-08-06 19:59:32 +06:00
Alexander Machehin 6bebb3b156 [#242] add ajax clone 2013-08-06 00:34:42 +06:00
Vokhmin Alexey V 63a26553cd #251: removed #search action 2013-08-05 16:52:15 +04:00
Alexander Machehin 541e1ebbe5 [#242] fix last refactoring of the controller 2013-08-05 17:21:56 +06:00
Alexander Machehin 8de9411203 [#242] refactoring controller 2013-08-05 15:33:59 +06:00
Vokhmin Alexey V 87f7aff544 #251: updated structure of json response 2013-08-03 14:47:23 +04:00
Alexander Machehin b8954471a9 [#242] refactoring controller 2013-08-03 09:58:45 +06:00
Vokhmin Alexey V 057fc3a675 #251: added pagination 2013-08-02 22:13:41 +04:00
Vokhmin Alexey V 39ccf5c91d #251: added groups to build_lists 2013-08-02 18:04:16 +04:00
Vokhmin Alexey V c8d094fbf7 #251: small refactoring of BuildList controller 2013-08-02 02:42:20 +04:00
Vokhmin Alexey V b3ab16ec09 #251: use AJAX for load data on BuildList#index page 2013-08-02 02:24:33 +04:00
Alexander Machehin f416bd9071 [#242] use datatable 2013-08-01 23:18:46 +06:00
Alexander Machehin 3f757a11c5 [#247] small refactoring build lists controller 2013-07-31 21:15:31 +06:00
Alexander Machehin 029273328c small refactoring build lists controller 2013-07-31 21:10:00 +06:00
Alexander Machehin eb184a8156 [#242] create build list from existing 2013-07-31 20:57:02 +06:00
Alexander Machehin 2362d7073d [#242] add ability to recreate build list 2013-07-30 17:31:54 +06:00
Vokhmin Alexey V a098e00a1a Merge branch 'master' into 226-remove-API-calls-from-JS
Conflicts:
	app/assets/javascripts/angularjs/controllers/project_refs_controller.js
	config/routes.rb
2013-07-23 19:23:20 +04:00
Vokhmin Alexey V 2a5d72550b Merge branch 'master' into 222-create-new-branch-on-web 2013-07-23 17:41:50 +04:00
Vokhmin Alexey V c9b7f890fa #222: removed #restore_branch method 2013-07-23 17:29:41 +04:00
Vokhmin Alexey V 157becb196 #226: removed API calls from JS 2013-07-23 16:29:35 +04:00
Vokhmin Alexey V eb4d4806f4 #226: updated Branches and Tags views, JS, etc. 2013-07-23 14:07:39 +04:00
Alexander Machehin 854f324627 redirect from issue to pull request and vice versa 2013-07-22 22:54:59 +06:00
Vokhmin Alexey V 079f8a955a #222: init GitHook on creating branch from UI 2013-07-22 18:21:12 +04:00
Vokhmin Alexey V 6f67b580c4 #222: added form for creating new branch 2013-07-22 15:27:14 +04:00
Vokhmin Alexey V 1fb472d416 #214: refactoring of Tree#destroy action according to Alexander's comments 2013-07-19 14:22:29 +04:00
Vokhmin Alexey V 7880fa4625 #214: added specs for Project #restore_branch && #delete_branch 2013-07-15 17:52:13 +04:00
Vokhmin Alexey V 2b423e6a6e #214: some refactoring of JS, added comments 2013-07-15 16:09:31 +04:00
Vokhmin Alexey V c79fbbd2d5 Merge branch 'master' into 214-delete-and-restore-branches 2013-07-13 00:31:52 +04:00
Vokhmin Alexey V a8f4648a08 #214: added skip_authorize_resource for TreeController 2013-07-13 00:30:02 +04:00
Vokhmin Alexey V fe8e1216c5 #214: remove unnecessary code 2013-07-12 23:27:49 +04:00
Vokhmin Alexey V ffcdd26c66 #214: updated UI of PullRequest#show 2013-07-12 18:21:46 +04:00
avokhmin 332168bf5e Merge pull request #216 from abf/rosa-build:fix_activity_for_pull_requests
fix dublication messages after creation pull request
2013-07-11 19:35:31 +04:00
Vokhmin Alexey V e096fc1bde #214: updated logic of deleting of branch 2013-07-11 17:50:22 +04:00
Vokhmin Alexey V 2e33f0038a #214: added ability to destroy branch 2013-07-11 17:03:02 +04:00
Vokhmin Alexey V ddbaffdb13 #214: removed unnecessary code 2013-07-11 14:37:02 +04:00
Vokhmin Alexey V d747ffd070 #214: updated #branches page, integrated AngularJS 2013-07-11 14:34:44 +04:00
Alexander Machehin 38ced2c998 [#200] fix dublication messages & activity after creating pull request 2013-07-10 01:55:43 +06:00
Vokhmin Alexey V f370645eed #211: added specs for BuildList controller, updated ability.rb 2013-07-04 23:55:56 +04:00
Vokhmin Alexey V 5652f2b6d3 #211: display only platforms for which user has access on read 2013-07-04 22:25:07 +04:00
Vokhmin Alexey V 1cd1ac45a1 #81: sort projects list alphabetically when no search 2013-07-01 14:50:35 +04:00
Alexander Machehin 8e189821bd remove extra pull check 2013-06-24 21:18:52 +06:00
Alexander Machehin 926c4d604d [#105] restore deleted code in error 2013-06-21 19:49:12 +06:00
Alexander Machehin 20056fbc31 many issue/pull fixes 2013-06-19 02:00:01 +06:00
warpc 9a24a636bc Merge pull request #174 from abf/rosa-build:173-undefined-method-render_as
[refs #173]: NoMethodError: undefined method "render_as"
2013-06-10 23:57:11 +04:00
Vokhmin Alexey V 9f80f662a5 #173: redirect to #tree_path when blob is tree 2013-06-10 20:44:57 +04:00
Alexander Machehin 28b12b8c96 [#135] add publish & reject publish action 2013-06-10 17:26:12 +06:00
Alexander Machehin 1db7955e0c Merge branch 'master' into 135-reject_build_lists
Conflicts:
	spec/controllers/api/v1/build_lists_controller_spec.rb
	spec/controllers/projects/build_lists_controller_spec.rb
2013-06-09 20:28:22 +06:00
Vokhmin Alexey V f3bcf89ab6 #156: removed unnecessary code 2013-06-05 00:06:56 +04:00
Vokhmin Alexey V 237bd6affb #156: update UI of MassBuild#new BuildList#new 2013-06-04 23:59:08 +04:00
Alexander Machehin b9a8464307 [#135] set rejector in api & small controllers refactoring 2013-05-30 16:41:09 +06:00
warpc 0df589c101 Merge pull request #144 from abf/rosa-build:114-change-ui-for-ability-to-attach-at-assembly-additional-packages
[refs #114]: Change UI for ability to attach at assembly additional sources of packages
2013-05-30 14:32:58 +04:00
Alexander Machehin afd24a65f5 [#135] set user who reject publication as publisher in build list 2013-05-30 15:54:07 +06:00
Vokhmin Alexey V 352d2ae027 #34: enable webhooks for all 2013-05-29 17:05:00 +04:00
Vokhmin Alexey V a26aac8463 #114: Split extra repos and build_lists into 2 elements 2013-05-27 22:13:00 +04:00
warpc 0da9bfef74 Merge pull request #103 from abf/rosa-build:34-webhook
[refs #34]: Webhook
2013-05-17 18:39:27 +04:00
Vokhmin Alexey V 6cf7a2e21d #34: added access rights to Hooks only for global admins 2013-05-17 00:07:40 +04:00
Vokhmin Alexey V 8319fe8e9b #133: attach only personal repositories to the build 2013-05-16 18:48:44 +04:00
Vokhmin Alexey V 9f73359cca #34: removed unnecessary comments 2013-05-16 15:36:29 +04:00
Vokhmin Alexey V 8a7e2c83a7 #34: some refactoring of HooksController 2013-05-16 13:52:55 +04:00
warpc d092a355a3 Merge pull request #128 from abf/rosa-build:98-common_tracker
[refs #98] common tracker for issues and pull requests
2013-05-16 12:29:14 +04:00
Vokhmin Alexey V 0b4e7f63fe Merge branch 'master' into 34-webhook 2013-05-14 13:46:31 +04:00
Alexander Machehin 8c7a4937c0 [#125] fix checking ability to create project for group 2013-05-08 20:41:15 +06:00
Alexander Machehin f588ec36f5 [#125] Add ability to create/fork project in group also for members with "write" access 2013-05-07 20:56:13 +06:00
Alexander Machehin d3ac9d1a2c [#98] Add common issues tracker 2013-04-30 00:14:25 +06:00
Vokhmin Alexey V 4c96629a28 #34: merge master into branch 2013-04-25 15:36:00 +04:00
Vokhmin Alexey V 015679b047 #73: merge master into branch 2013-04-23 17:21:10 +04:00
Vokhmin Alexey V 26c7a5a711 #34: added specs for Hooks controller 2013-04-15 15:47:53 +04:00
Vokhmin Alexey V 5dca2e914d #34: update ability.rb 2013-04-15 14:30:48 +04:00
Vokhmin Alexey V 03396ea606 #34: update messages, comments 2013-04-15 13:40:41 +04:00
Vokhmin Alexey V 4414479650 #34: update UI 2013-04-15 13:25:40 +04:00
Vokhmin Alexey V 9e286bb5a2 #34: update controller, views, model of Hook 2013-04-14 19:46:56 +04:00
Vokhmin Alexey V d28a2b0173 #34: added Hook model, controller, views 2013-04-12 17:26:18 +04:00
Vokhmin Alexey V 9b851001f8 Merge branch 'master' into 82-extend-abilities-of-personal-platforms 2013-04-09 15:15:09 +04:00
Vokhmin Alexey V 38ce6115c2 #73: merge master into branch 2013-04-08 22:55:21 +04:00
Vokhmin Alexey V 958017b3ed #82: update for adding new packages into repository 2013-04-08 18:27:50 +04:00
warpc 1a9ff66f26 Merge pull request #66 from abf/rosa-build:19-gfm
[#19] add members/issues/pull requests/emoji references
2013-04-08 15:33:44 +04:00
Alexander Machehin 914a2967c3 Merge branch 'master' into 19-gfm
Conflicts:
	app/views/projects/issues/_issue.html.haml
2013-04-08 17:04:59 +06:00
Vokhmin Alexey V 179615f5b7 #73: create #by_owner_and_name scope 2013-04-04 17:33:11 +04:00
Vokhmin Alexey V 110499360b #73: small refactoring 2013-04-04 01:18:56 +04:00
Vokhmin Alexey V 9dcd08b868 #73: add owner_uname into Project 2013-04-04 01:06:13 +04:00
Vokhmin Alexey V 62ff6312b4 #73: Increatse performance for #autocomplete_to_project action 2013-04-03 20:03:52 +04:00
Vokhmin Alexey V 9e7eb7af94 #29: merge master into branch 2013-04-03 16:10:22 +04:00
Vokhmin Alexey V a33e20c5e4 #51: add new specs for Issue 2013-04-03 15:11:50 +04:00
Vokhmin Alexey V 6585c3a92b #51: move logic to controller 2013-04-03 13:59:34 +04:00
Vokhmin Alexey V 8b6a0eab0f #51: some refactoring 2013-04-03 01:59:33 +04:00
Vokhmin Alexey V 2bc580500d #51: Change rights for operations with tags and assignee 2013-04-03 01:23:00 +04:00
Vokhmin Alexey V 05a8cec169 #53: added Publisher into BuildList 2013-03-28 15:58:26 +04:00
Alexander Machehin 70e37925c6 Merge branch 'master' into 19-attach_issue_to_issue
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
2013-03-28 00:19:59 +06:00
Alexander Machehin 8290b412fc [#19] removed old code 2013-03-22 23:31:12 +06:00
Alexander Machehin ce2ca6646e [#19] add issue references from commit 2013-03-22 22:50:13 +06:00
Vokhmin Alexey V 8e21159314 #37: some styles changes 2013-03-22 01:20:36 +04:00
Vokhmin Alexey V c3a9246d09 #37: fix for assignee User to PullRequest 2013-03-21 00:46:33 +04:00
Vokhmin Alexey V 5239be2827 #37: update filter by "Accessory" for PullRequests 2013-03-20 19:22:13 +04:00
Vokhmin Alexey V f6ec81bb35 #37: update UI for "Assignee" Issues and PullRequests 2013-03-20 19:06:25 +04:00
Vokhmin Alexey V a92df70c5e #26: update 'font-size' for issue-title, increase count of issues on page 2013-03-20 01:30:35 +04:00
Vokhmin Alexey V ccccc3f082 #26: update 'Comment' model according to Vladimir's comments 2013-03-19 21:05:55 +04:00
Vokhmin Alexey V 2c56283fba #26: fixed search by substring 2013-03-19 19:30:50 +04:00
Vokhmin Alexey V 568ea50ac1 #26: move #touch_issue method into Comment model 2013-03-19 16:40:54 +04:00
Vokhmin Alexey V 32062f75c7 #26: touch Issue#updated_at field when comment has been changed (created/updated/destroyed) 2013-03-19 16:32:17 +04:00
Vokhmin Alexey V f8fb48a85b #26: remove unnecessary stiles, JS, update PullRequests controller 2013-03-19 16:11:02 +04:00
Vokhmin Alexey V f4381b61c6 #26: update table on issues page with Ajax 2013-03-19 15:57:01 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Alexander Machehin 6c00085c84 change default base branch on create pull request 2013-03-07 18:22:48 +06:00
Vladimir Sharshov bbc699cb6d Merge pull request #947 from warpc/757-enable-extra-containers-for-main-platforms
[refs #757]: Enable extra containers for main platforms
2013-02-25 07:43:28 -08:00
Alexander Machehin ab703ffa4f #959 fix did you run git update-server-info on the server? 2013-02-25 20:35:39 +06:00
Vladimir Sharshov 96abcad5ce Merge pull request #950 from warpc/944-fix_branch_errors
[refs #944] disable selecting tag on branches page, new way to check empty project and fix undefined method `name' for nil:NilClass
2013-02-22 03:24:48 -08:00
Vokhmin Alexey V 7a2b547d2b #757: rename #extra_containers to #extra_build_lists 2013-02-22 15:04:14 +04:00
Vokhmin Alexey V 79d81e9c13 #757: add logic for enable/disable "auto_create_container" field on UI, some refactoring 2013-02-22 14:20:47 +04:00
Vokhmin Alexey V 38b6375ca3 #757: send error when some containers for main platform have not been published 2013-02-22 13:09:37 +04:00
Alexander Machehin 836a030438 fixing errors with wrong branch (again) #944 2013-02-22 14:54:04 +06:00
Alexander Machehin e08c31e314 #944 refactoring checking empty project 2013-02-22 13:22:34 +06:00
Alexander Machehin 71de1477b3 #944 fix check empty repository 2013-02-22 13:17:00 +06:00
Vokhmin Alexey V 3e9c28e238 #757: merge master into branch 2013-02-22 02:17:20 +04:00
Vladimir Sharshov 7a8dcc1b10 Merge pull request #948 from warpc/944-fix_branch_errors
[refs #944] Fix branch errors: 
- empty project;
- show branches pages when active tag selection.
2013-02-21 12:01:46 -08:00
Alexander Machehin 750131ae74 #944 show no branches on empty project 2013-02-22 01:59:02 +06:00
Alexander Machehin e9dec9192f #944 fix error with branches list 2013-02-22 01:24:20 +06:00
Alexander Machehin 2ba37b5da4 #944 fix showing empty project 2013-02-22 01:23:45 +06:00
Vokhmin Alexey V 28f539f0b4 #757: update BuildList validation 2013-02-21 18:46:52 +04:00
Vokhmin Alexey V 219ef67699 #757: add filter by save_to_platform_id in #autocomplete method 2013-02-21 18:28:54 +04:00
Vokhmin Alexey V 46a5b8daad #757: enable extra containers and repositories for main platforms 2013-02-21 18:21:58 +04:00
Alexander Machehin 3902a78e37 #921 refactoring per page 2013-02-21 18:46:28 +06:00
Alexander Machehin 3dda72a0ac Merge branch 'master' into 921-task-monitoring
Conflicts:
	app/assets/javascripts/extra/build_list.js
2013-02-21 00:54:04 +06:00
Alexander Machehin e5db61197e [refs #921] add new filter to the build list monitoring 2013-02-20 21:07:11 +06:00