Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,414 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

2473 Commits

Author SHA1 Message Date
Alexander Machehin c6f45956cc [refs #90] fixed error by 24fd99b2d5cab 2012-10-18 18:50:43 +06:00
Alexander Machehin e15bf13c4f [refs #90] small refactoring of the diff method 2012-10-18 18:09:12 +06:00
Alexander Machehin 62ca030110 [refs #90] head_branch -> from_branch 2012-10-18 17:46:57 +06:00
Vokhmin Alexey V b7eff22c23 #698: added API for Advisories 2012-10-18 15:22:31 +04:00
Alexander Machehin 7870ffef7d [refs #579] fixed some bugs 2012-10-18 00:38:42 +06:00
Vokhmin Alexey V 97590f06a0 #686: added specs for projects API 2012-10-17 21:08:21 +04:00
Vokhmin Alexey V 6680265c64 #686: some refactoring of relations 2012-10-17 17:46:16 +04:00
Vokhmin Alexey V a89380c4e2 #686:small refactoring 2012-10-17 16:46:19 +04:00
Vokhmin Alexey V 4e075ac121 #686: created owner partial, small refactoring 2012-10-17 16:35:56 +04:00
Vokhmin Alexey V 2d067a45ca #686: added members action for project API 2012-10-17 16:18:52 +04:00
Vokhmin Alexey V 351821912b #686: added API for show list of projects 2012-10-17 14:35:33 +04:00
Vokhmin Alexey V f0caf6a9f9 #692: updated groups/profile_controller 2012-10-16 20:38:49 +04:00
Vokhmin Alexey V e5af275c3a #692: small refactoring according to Alexander's comments 2012-10-16 20:36:59 +04:00
Vokhmin Alexey V c36ae5413b #692: added specs for Group API 2012-10-16 18:44:21 +04:00
Vokhmin Alexey V 432e219571 #692: some refactoring 2012-10-16 17:42:52 +04:00
Alexander Machehin 3868fbf4f3 [refs #579] forgot change to the pull.repo 2012-10-16 19:22:19 +06:00
Alexander Machehin b2fd348351 [refs #579] fixed bug with saving around lines 2012-10-16 19:21:47 +06:00
Alexander Machehin f060d919d9 [refs #579] add new helper 2012-10-16 19:20:55 +06:00
Vokhmin Alexey V df105efd56 #692: added #update_member action for Groups API 2012-10-16 17:03:18 +04:00
Vokhmin Alexey V 5795e1cea5 #692: updated API 2012-10-16 16:35:30 +04:00
Vokhmin Alexey V 7327d195c4 #692:added show action for Groups API 2012-10-16 15:51:14 +04:00
Vokhmin Alexey V d99a2104ce #692:added index action for Groups API 2012-10-16 15:49:07 +04:00
Alexander Machehin 9579734506 [refs #579] some optimization by getting pull repo 2012-10-16 16:19:53 +06:00
Alexander Machehin b0604f89d1 [refs #579] move logick to model 2012-10-16 15:50:21 +06:00
Alexander Machehin a807a22230 [refs #579] remove debug code 2012-10-16 14:07:26 +06:00
Vladimir Sharshov 0c475b35f7 Merge pull request #694 from warpc/691-rest-api-for-users 
[refs #691]: REST API for Users
 2012-10-15 12:10:12 -07:00
Vokhmin Alexey V 888cbe445e #691: small refactoring 2012-10-15 22:30:06 +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
Alexander Machehin 5c7fb21511 [refs #579] add cursor pointer to arrow 2012-10-16 00:16:01 +06:00
Alexander Machehin cef112efc3 [refs #579] first version of the outdated diff 2012-10-16 00:14:43 +06:00
Alexander Machehin 8d4311e419 [refs #579] remove a wrong line 2012-10-15 23:46:44 +06:00
Alexander Machehin 66f0cc3244 [refs #579] fixed setting status to inline comments 2012-10-15 23:45:01 +06:00
Alexander Machehin e3a0005bd3 [refs #579] small refactoring 2012-10-15 23:42:28 +06:00
Alexander Machehin ef37180825 [refs #579] small activity refactoring 2012-10-15 22:50:21 +06:00
Alexander Machehin fb1288e382 [refs #579] ugly sorting common pull comments 2012-10-15 22:33:16 +06:00
Vokhmin Alexey V 6aef7cfb30 #691: revert base controller 2012-10-15 19:49:52 +04:00
Vokhmin Alexey V f3605a1211 #691: updated routes according to Vladimir's comments 2012-10-15 19:47:42 +04:00
Vladimir Sharshov c115a37a04 Merge pull request #695 from warpc/add-invitation-link-to-register_requests-table 
added invitation link to the table
 2012-10-15 08:28:35 -07:00
Alexander Machehin a7a442c4e1 [refs #90] fixed rendering diff 2012-10-15 21:24:29 +06:00
Vokhmin Alexey V 3e0b3b8bfc added invitationlink to the table 2012-10-15 19:24:20 +04:00
Vokhmin Alexey V 5aa5bbc0b8 #691: small refactoring 2012-10-15 18:50:58 +04:00
Vokhmin Alexey V 84b49052b1 #691: added specs for Users API 2012-10-15 18:43:09 +04:00
Vokhmin Alexey V 0879a7e46f #691: added #notifiers and #update actions for Users API 2012-10-15 18:06:08 +04:00
Vokhmin Alexey V 2ae671df21 Merge branch 'master' into 691-rest-api-for-users 2012-10-15 17:03:05 +04:00
Alexander Machehin 1ee9e3f00e [refs #579] fixed updating comment 2012-10-15 18:30:34 +06:00
Vladimir Sharshov 8c7ac11ec7 Merge pull request #689 from warpc/672-rest-api-for-repositories 
[refs #672]: REST API for Refositories
 2012-10-15 04:44:08 -07:00
Vokhmin Alexey V 9087a15627 #672: small refactoring Api::V1::BaseController#member method 2012-10-15 14:07:10 +04:00
Alexander Machehin 00323cec82 [refs #579] grouped commits 2012-10-15 16:03:35 +06:00
Vokhmin Alexey V 5d9a1e2586 #672: removed API helper 2012-10-15 13:48:25 +04:00
Vokhmin Alexey V e50bd3a2b5 #691: added #show action for Users API 2012-10-15 13:45:00 +04:00
Vokhmin Alexey V fae5d3ff2b #690: truncate project name before validation 2012-10-15 12:28:18 +04:00
Vokhmin Alexey V 5c88ac6f3e #672: updated Repositories#signatures API action, added specs 2012-10-14 18:44:10 +04:00
Vokhmin Alexey V 00f5d0ce62 #672: updated Repositories API 2012-10-14 17:38:06 +04:00
Vokhmin Alexey V 146f72c062 #672: small refactoring 2012-10-14 16:39:58 +04:00
Vokhmin Alexey V be8ed0984a #672: added #add_member, #remove_member, #update, #destroy actipns for Repository API 2012-10-14 16:00:49 +04:00
Alexander Machehin b9d69a966b [refs #579] add 404 for wrong commit hash 2012-10-13 01:59:14 +06:00
Alexander Machehin c5d6707b8f [refs #579] fixed commit comments errors 2012-10-13 01:57:54 +06:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +06:00
Alexander Machehin 6981a7f238 [refs #648] disable submiting the project filter form 2012-10-12 16:24:51 +06:00
Vladimir Sharshov 2e0f4dc2eb Merge pull request #680 from warpc/671-rest-API 
[refs #671]: full rest API for Platforms; Add refs_list api for Project
 2012-10-11 13:12:32 -07:00
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Vokhmin Alexey V 8f3ed58cd8 #671: added Projects#refs_list API action 2012-10-11 20:27:17 +04:00
Alexander Machehin 7f031ac688 [refs #374] added commit validation 2012-10-11 22:11:53 +06:00
Vokhmin Alexey V 6b3bf41c7a #671: removed before_filter 2012-10-11 19:36:14 +04:00
Vokhmin Alexey V 992892f2c8 #671: small refactoring 2012-10-11 19:18:54 +04:00
Alexander Machehin a7bb5f48ba [refs #90] fixed wiki diff 2012-10-11 01:16:47 +06:00
Alexander Machehin e379a603b4 [refs #90] get new pull to this project 2012-10-11 00:59:25 +06:00
Vokhmin Alexey V 05d222e9de #671: updated output errors 2012-10-10 21:51:00 +04:00
Vokhmin Alexey V eef640e82c #671: added API Platforms#create action, updated specs, added validation to platform model 2012-10-10 21:45:56 +04:00
Vokhmin Alexey V 919459617a #671: small refactoring 2012-10-10 20:31:22 +04:00
Vokhmin Alexey V 0841c4d705 added 400 error for API BuildLists#create action 2012-10-10 20:19:00 +04:00
Vokhmin Alexey V 972877bc76 #671: added API Platforms#destroy action and specs 2012-10-10 19:43:14 +04:00
Vokhmin Alexey V d9c583e226 #671: added specs for API Platforms#clone action 2012-10-10 19:13:14 +04:00
Vokhmin Alexey V e6bb63db08 #671: removed restrict_paginate method 2012-10-10 16:02:59 +04:00
Vokhmin Alexey V e5c6707594 #671: added #remove_member action for platforms API, updated specs 2012-10-09 21:07:10 +04:00
Vokhmin Alexey V 30909b281d #671: added #add_member action for platforms API, added new specs 2012-10-09 20:23:48 +04:00
Vokhmin Alexey V 9e6e2de955 #671: added #members action for platforms API 2012-10-09 19:06:27 +04:00
Vokhmin Alexey V abe31b3c2e #671: added API #update action for platform 2012-10-09 18:46:20 +04:00
Alexander Machehin e7cd5f008a Revert "[refs #579] save additional info for pull inline comments" 
This reverts commit 0de497c30f15720ae3b2f31c19e7ed2fdc390ad2.

Conflicts:

	app/controllers/projects/comments_controller.rb
 2012-10-09 20:15:10 +06: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
Vokhmin Alexey V feefe8ed89 #374: added #platforms_for_build action for Platforms API 2012-10-08 22:02:44 +04:00
Alexander Machehin a5477926bc [refs #579] fix checking path 2012-10-08 21:36:46 +06:00
Alexander Machehin fcfdf1b26b [refs #579] change 'base' & 'head' -> 'to' & 'from' 2012-10-08 21:36:23 +06:00
Alexander Machehin 70e8a1fe0d [refs #579] unless -> if 2012-10-08 21:33:43 +06:00
Alexander Machehin 21b7b0d0b1 [refs #579] dont create wrong comment 2012-10-08 21:31:30 +06:00
Alexander Machehin 3241b7a55a [refs #579] save additional info for pull inline comments 2012-10-08 20:54:36 +06:00
Alexander Machehin 548f698526 [refs #579] add a line comment button 2012-10-08 20:42:38 +06:00
Vokhmin Alexey V ec0ec5fc32 #374: revert some changes 2012-10-08 17:37:09 +04:00
Vokhmin Alexey V b1a9e2aa21 #374: updated api for projects 2012-10-08 16:47:02 +04:00
Alexander Machehin 824ee79452 [refs #579] redirect to created comment 2012-10-08 15:20:45 +06:00
Alexander Machehin f12634cee8 [refs #579] add link to comments 2012-10-08 15:14:31 +06:00
Alexander Machehin ed7aec602f [refs #579] alpha version of the pull inline comments 2012-10-06 01:19:05 +06:00
Alexander Machehin 3513d47be6 [refs #90] fix updating pull 2012-10-05 23:32:29 +06:00
Alexander Machehin 49946f4f53 [refs #90] fix creating a blocked pull 2012-10-05 23:31:06 +06: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 afa6dd0706 [refs #579] fixed style 2012-10-05 15:39:07 +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 a24ea9a4b1 [refs #579] fixed & refactoring markdown help 2012-10-05 14:16:27 +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
Vokhmin Alexey V b3123a752e #671: updated build list api 2012-10-04 19:38:33 +04:00
Vokhmin Alexey V 21a0d982f1 #671: updated arch field in json for build_lists API 2012-10-04 19:30:31 +04:00
Vokhmin Alexey V f5d0d9f20b #671: added filter platforms by type 2012-10-04 17:34:30 +04:00
Vokhmin Alexey V df0251282d #671: updated API arches controller, added specs 2012-10-04 17:13:55 +04:00
Vokhmin Alexey V 4b72501159 #671: added Architectures API 2012-10-04 16:45:49 +04:00
Vladimir Sharshov f10640695e Merge pull request #670 from warpc/624-wrong-files-on-raw-downloading 
[refs #624]: Fixed downloading RAW files
 2012-10-04 02:44:14 -07:00
Vokhmin Alexey V ad50934bab #624: fixed downloading RAW files 2012-10-04 01:20:07 +04:00
Vladimir Sharshov ca697c0c4b Merge pull request #669 from warpc/668-create-uploading-avatar-for-group 
[refs #668]: Ability to upload avatar for group
 2012-10-03 13:29:28 -07:00
Vokhmin Alexey V 33209e7200 hotfix for downloading 'tar' archives 2012-10-04 00:27:13 +04:00
Vokhmin Alexey V 04b2647ef0 #668: added uploading avatars for groups 2012-10-03 20:38:42 +04:00
Alexander Machehin bf7bc8787a [refs #90] small controller refactoring 2012-10-03 17:59:18 +06:00
Alexander Machehin 94029c3cda [refs #90] base -> to, head -> from 2012-10-03 17:58:34 +06:00
Alexander Machehin 1d424b463c [refs #90] fix when creating new pull 2012-10-03 09:21:16 +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 b3fd95d7fa [refs #90] always redirect to pull on update action 2012-10-02 21:27:15 +06:00
Vokhmin Alexey V ba7a7b20a5 #349: updated locales, added shared template 2012-10-02 19:20:58 +04: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 f66f80c128 Merge branch 'master' into 90-ui 
Conflicts:
	spec/controllers/projects/pull_requests_controller_spec.rb
 2012-10-02 19:43:23 +06:00
Alexander Machehin d36155ec7f [refs #90] remove useless abilities 2012-10-02 19:24:53 +06:00
Vokhmin Alexey V ffe38b0a08 #349: updated Users::ProfileController and Groups::ProfileController 2012-10-02 16:04:26 +04:00
Alexander Machehin 35c965a796 [refs #90] add all ancestors to base project choise 2012-10-02 15:20:48 +06:00
Alexander Machehin d948949532 [refs #90] new pull optimization 2012-10-02 15:14:31 +06:00
Vladimir Sharshov 226f1b592c Merge pull request #663 from warpc/90-add-specs-for-pull-requests 
[refs #90]: add specs for pull requests
 2012-10-01 11:12:01 -07:00
Alexander Machehin 8f011316c3 [refs #90] possible fix for nil commom ancestor commit 2012-10-01 23:52:18 +06:00
Alexander Machehin f92f209323 [refs #90] fixed changing base project 2012-10-01 23:43:15 +06:00
Alexander Machehin 948e0892bf [refs #90] markdown in create pull 2012-10-01 22:48:26 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Vokhmin Alexey V 3271fd8479 #658: small refactoring 2012-10-01 17:33:46 +04:00
Vokhmin Alexey V 234615d728 #658: added link to notification center in email 2012-10-01 17:08:02 +04:00
Vokhmin Alexey V c4e974a89e Merge branch 'master' into 90-add-specs-for-pull-requests 2012-10-01 15:42:06 +04:00
Alexander Machehin 9b9295ba4f [refs #90] change ui on create pull 2012-09-28 23:46:02 +06:00
Alexander Machehin 90069b2fb6 [#refs #90] fix pull flashes 2012-09-28 23:45:27 +06:00
Alexander Machehin 64ee8b6845 [refs #90] change pull header 2012-09-28 21:49:10 +06:00
Alexander Machehin fbc537174e [refs #90] search base project by fullname 2012-09-28 21:39:45 +06:00
Vokhmin Alexey V fb8d1ded5f #90: added some specs for pull requests 2012-09-28 19:08:51 +04:00
Alexander Machehin 8cb9171c17 [refs #90] final fix to merge 2012-09-28 20:31:21 +06:00
Alexander Machehin 0069dfffc7 [refs #90] catch error 2012-09-28 18:26:12 +06:00
Vladimir Sharshov 847ecc2a15 [refs #374] Remove unused data from build list api 2012-09-28 14:38:01 +04:00
Vokhmin Alexey V e310f5607c #90: removed unnecessary code 2012-09-27 23:30:59 +04:00
Vokhmin Alexey V 7e09f17b58 Merge branch 'master' into 90-create-discussion-in-the-pull-requests-like-github 2012-09-27 22:37:54 +04: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
Vokhmin Alexey V bd04e8ea75 #90: revert changes in the controller 2012-09-27 21:54:40 +04:00