Commit Graph

309 Commits

Author SHA1 Message Date
Alexander Machehin 20056fbc31 many issue/pull fixes 2013-06-19 02:00:01 +06:00
Vokhmin Alexey V 8d7a9426af #167: added comments, updated ability.rb 2013-06-13 13:35:42 +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
Alexander Machehin b8636d2f71 [#135] fix ability & add specs for reject publishing 2013-06-09 17:44:10 +06:00
Vokhmin Alexey V fb0e623e0b #156: added specs for MassBuildController, some refactoring, updated access rights 2013-06-05 17:48:11 +04: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
Vokhmin Alexey V ff04874278 #156: added MassBuild for personal platforms 2013-06-03 19:20:23 +04:00
Alexander Machehin ca481a4672 [#135] extend ability to reject publishing 2013-05-30 15:44:58 +06:00
Vladmir Sharhsov(warpc) 37f6390910 Allow all users use search method for advisories 2013-05-21 20:55:29 +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
Alexander Machehin 8b0b81665d [#123] show additional platforms where user is member of platform repository 2013-05-17 16:26:22 +06:00
Vokhmin Alexey V 8a7e2c83a7 #34: some refactoring of HooksController 2013-05-16 13:52:55 +04:00
Vokhmin Alexey V 0b4e7f63fe Merge branch 'master' into 34-webhook 2013-05-14 13:46:31 +04:00
Alexander Machehin ccb5665aae [#125] restore ability admin of the groups 2013-05-07 21:26:50 +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
Vokhmin Alexey V 4c96629a28 #34: merge master into branch 2013-04-25 15:36:00 +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 2b45e14545 #82: enabled ability to create repositories for personal platforms 2013-04-05 23:12:09 +04:00
Vokhmin Alexey V 9e7eb7af94 #29: merge master into branch 2013-04-03 16:10:22 +04:00
Vokhmin Alexey V 1fd4ea4da7 #55: added anonymous access for mass_builds page 2013-04-01 14:52:12 +04:00
Vokhmin Alexey V d0c22b8c4b #31: merge master into branch 2013-03-22 22:59:06 +04:00
Vokhmin Alexey V 3865332e8a #31: add UI for save product_build_list 2013-03-22 20:04:29 +04:00
Vokhmin Alexey V c6ca02510c #40: add specs for MassBuilds#publish action 2013-03-21 19:17:30 +04:00
Vokhmin Alexey V cff502bf48 #40: added ability to publish build lists of mass build. 2013-03-21 18:41:45 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Vokhmin Alexey V 9de37b852e #1: rename #update_secondary to #local_admin_manage 2013-03-07 14:05:53 +04:00
Vokhmin Alexey V be9ada74cb #1: fix for specs, update ability for Platform 2013-03-07 02:47:30 +04:00
Vokhmin Alexey V 98891a9153 #1: fix for specs, update ability.rb 2013-03-07 02:39:44 +04:00
Vokhmin Alexey V 0021232ee3 #1: update specs for API 2013-03-06 02:04:31 +04:00
Vokhmin Alexey V edb47598d5 #1: remove some access rights from admins of platform 2013-03-06 01:24:03 +04:00
Vokhmin Alexey V 5b0c28c3e7 #963: disable #publish action for all users if project does not exist in repository 2013-02-26 21:18:24 +04:00
Vokhmin Alexey V 72ef2789f6 #963: small refactoring 2013-02-26 21:06:18 +04:00
Vokhmin Alexey V b7b1d909ac #963: add checking that project exist in repository to #can_publish? method 2013-02-26 20:49:21 +04:00
Vokhmin Alexey V 8b994cc6a5 #963: publish build list only if project exist in repository 2013-02-26 20:24:42 +04:00
Vokhmin Alexey V 9b488c1765 #757: update Ability.rb model, add specs, remove hack for 237 platform 2013-02-25 22:34:45 +04:00
Vokhmin Alexey V 4271cdebc6 #757: add new actions into ability.rb 2013-02-25 20:26:58 +04:00
Alexander Machehin ac69547805 [refs #893] add regenerate metadata for repository 2013-02-11 21:24:17 +06:00
Vokhmin Alexey V 8629ae8ca3 #756: update UI 2013-02-06 13:42:34 +04:00
Vokhmin Alexey V e4924993a7 #894: update ability.rb, add new specs 2013-02-05 17:08:40 +04:00
Vokhmin Alexey V e92751939a #880: some fixes, update ability.rb 2013-02-01 21:45:49 +04:00
Vokhmin Alexey V 2fa96551aa #880: remove unnecessary code, update specs 2013-02-01 21:25:42 +04:00
Vokhmin Alexey V 973fabb31f #880: add option "Publish again" for build list 2013-02-01 18:39:17 +04:00
Alexander Machehin 18d0af9749 [refs #868] add ability to create a container to admins of the platform 2013-01-30 14:55:09 +06:00
Vokhmin Alexey V 0de439e9cb hot fix 2013-01-25 21:42:33 +04:00
Vokhmin Alexey V eec4ec95a7 update ability.rb 2013-01-25 21:41:48 +04:00
Vokhmin Alexey V f4c3d23d7c create container for BuildList 2013-01-25 21:24:46 +04:00
Vokhmin Alexey V c6f13c60b7 #794: small refactoring 2013-01-16 19:16:42 +04:00
Vokhmin Alexey V da4860bc45 #794: add #key_pair action, add new specs 2012-12-20 23:46:16 +04:00
Vladimir Sharshov c677e37c20 Merge pull request #763 from warpc/759-stop-and-delete-action-for-build-list
[refs #759]: cancel ProductBuildList and BuildList;
refactroing ProductBuildList; add new user role "tester"; set timeout for workers to 12 hours; refactoring worker_observers
2012-12-07 03:58:57 -08:00
Alexander Machehin dc1525b85e [refs #762] add mass build from list 2012-12-06 23:59:17 +06:00
Vokhmin Alexey V ff2ae73985 #759: add action for cancel build, some refactoring 2012-12-06 18:41:24 +04:00
Vokhmin Alexey V abbbacdf7f update ability.rb, add new specs 2012-11-13 15:11:33 +04:00
Vokhmin Alexey V e9fd2a2df6 Merge branch 'master' into 706-get-list-of-projects-by-repository 2012-10-19 18:51:11 +04:00
Vokhmin Alexey V ba968cc5a0 #706: updated Ability model, Repositories controller, added specs 2012-10-19 18:49:01 +04:00
Alexander Machehin 6c8c1ca880 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-10-19 18:47:26 +06:00
Vokhmin Alexey V 97590f06a0 #686: added specs for projects API 2012-10-17 21:08:21 +04:00
Vokhmin Alexey V c36ae5413b #692: added specs for Group API 2012-10-16 18:44:21 +04:00
Alexander Machehin 938a8a0ad1 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/views/projects/pull_requests/_pull_diff.html.haml
	app/views/projects/wiki/_diff_data.html.haml
2012-10-16 00:19:22 +06:00
Vokhmin Alexey V 00f5d0ce62 #672: updated Repositories API 2012-10-14 17:38:06 +04:00
Vokhmin Alexey V 07bf8f1d0f fixed missprint 2012-10-09 17:54:17 +04:00
Vokhmin Alexey V 1e2d41b183 updated Ability model 2012-10-09 17:50:09 +04:00
Vokhmin Alexey V d83243a3a3 hot fix for API 2012-10-09 17:47:05 +04:00
Alexander Machehin 80a91b21a9 [refs #579] fixed bug with new_line access 2012-10-05 18:32:56 +06:00
Alexander Machehin 2360a25a42 [refs #579] fixed many errors 2012-10-05 17:02:25 +06:00
Alexander Machehin e085784d51 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/helpers/diff_helper.rb
	app/models/ability.rb
	app/views/projects/comments/_list.html.haml
	app/views/projects/git/commits/_commit_diff.html.haml
	lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
Alexander Machehin 21a5115137 [refs #579] fixed destroing comments 2012-10-05 12:13:14 +06:00
Alexander Machehin 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06:00
Alexander Machehin 94029c3cda [refs #90] base -> to, head -> from 2012-10-03 17:58:34 +06:00
Vladimir Sharshov d2c338e4e4 Merge pull request #665 from warpc/90-ui
[refs #90] pull request ui + fixes
2012-10-02 10:41:06 -07:00
Vokhmin Alexey V ecae06db81 #349: removed duplicate of ability 2012-10-02 21:16:55 +04:00
Vokhmin Alexey V cb994c6fd6 #349: created autocompletes_controller, refactoring, updated specs 2012-10-02 20:54:55 +04:00
Alexander Machehin f699add7b4 [refs #90] clean ability 2012-10-02 22:46:51 +06:00
Alexander Machehin 53b421d8e5 [refs #90] fixed pull ability for project writers & changing tests 2012-10-02 21:19:50 +06:00
Vokhmin Alexey V c7fda1a810 #349: updated ability model according to Alexander comments, reverted some changes, added paging for projects on #show page 2012-10-02 19:14:08 +04:00
Alexander Machehin d36155ec7f [refs #90] remove useless abilities 2012-10-02 19:24:53 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Alexander Machehin abafbc6ef5 Merge again-and-again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-09-28 00:09:34 +06:00
Alexander Machehin f579fc007a [refs #90] fixed ability for pulls 2012-09-28 00:00:04 +06:00
Alexander Machehin 2b4e2f03e5 Merge pull request #585 from warpc/374-rest_api_for_builds
[refs #374] Add json responses for build lists api
2012-09-27 07:00:19 -07:00
Vladimir Sharshov 77b57cce11 [refs #374] Fix support http basic auth, fix tests, fix abilities. 2012-09-26 21:15:11 +04:00
Alexander Machehin cc05fa695a [refs #90] fixed pull abilities part 2 2012-09-26 23:09:29 +06:00
Alexander Machehin 3491492c8d [refs #90] fixed pull authorization 2012-09-26 15:24:46 +06:00
Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull
Fucking conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/ability.rb
	app/views/projects/issues/show.html.haml
	config/routes.rb
	db/schema.rb
	lib/tasks/import.rake
	spec/models/comment_for_commit_spec.rb
	vendor/assets/javascripts/bootstrap-tab.js
	vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Alexander Machehin a29a2f8fe9 [refs #616] change ability for preview 2012-09-25 15:46:19 +06:00
konstantin.grabar 11c428ec20 [refs #374] Fix failed tests after http basic auth 2012-09-21 23:48:30 +04:00
konstantin.grabar e94c6f4f00 [refs #374] Merge master into 374-rest_api_for_builds 2012-09-21 13:20:04 +04:00
Alexander Machehin a4c8e8eff8 Merge branch 'master' into 616-issues_and_comments
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
Vokhmin Alexey V aadfb39682 #638: added access to add/remove member to repository for owner and local_admin 2012-09-12 16:17:51 +04:00
Vokhmin Alexey V 1f32e72508 #638: added access to remove_project for members of repository 2012-09-12 00:43:08 +04:00
Vokhmin Alexey V 96466b808b #638: fixed ability model 2012-09-12 00:40:16 +04:00
Vokhmin Alexey V b4c2c368e4 #638: added permissions to add new project for members of repository 2012-09-12 00:27:28 +04:00
Vladimir Sharshov 8c06b0c18d [refs #631] Fix right for publication build list using publish button 2012-09-07 22:45:03 +04:00
Pavel Chipiga 768e40ee2a Merge branch 'master' into 631-publish-to-the-repository-without-qa
Conflicts:
	app/models/ability.rb
2012-09-07 16:38:21 +03:00
Vladimir Sharshov 29f5ef5f2e Refactoring tests 2012-09-07 13:41:49 +04:00
Vladimir Sharshov 4828aa24f8 Merge branch 'master' into 349-anonymous_access
Conflicts:
	spec/controllers/platforms/maintainers_controller_spec.rb
	spec/factories/build_lists.rb
2012-09-07 00:36:06 +04:00
Vladimir Sharshov 71e28cf3f3 Merge branch 'master' into 349-anonymous_access 2012-09-07 00:31:28 +04:00
Pasha 9247a1c850 Merge pull request #613 from warpc/263-refactoring
[#263] Исправление и рефакторинг тестов
2012-09-06 13:23:23 -07:00