Commit Graph

1566 Commits

Author SHA1 Message Date
Vladimir Sharshov 34bb256ff1 Merge pull request #715 from warpc/iso-worker
[refs #711] Integration Iso worker
2012-11-14 03:14:28 -08:00
Alexander Machehin 8df87ed292 [refs #90] fixed error on create 2012-11-14 16:51:10 +06:00
Alexander Machehin 9c0ae23927 small refactoring 2012-11-13 20:29:59 +06:00
Alexander Machehin 21a32fba6c show expected message after add member error 2012-11-13 20:29:45 +06:00
Vokhmin Alexey V abbbacdf7f update ability.rb, add new specs 2012-11-13 15:11:33 +04:00
Vokhmin Alexey V 21d8a42072 merge master into the branch 2012-11-12 20:52:33 +04:00
Vokhmin Alexey V 51aff682d4 some refactoring according to Alexander's comments 2012-11-12 20:23:11 +04:00
Vokhmin Alexey V 259eeaecfc add Stop action and time_living for building ISO 2012-11-12 17:22:19 +04:00
Vokhmin Alexey V 8f9cd0ff8a updated logger on build product page 2012-11-09 21:42:25 +04:00
Alexander Machehin 26af1aa27c Merge branch 'master' into 90-fix_orphan_pulls
Conflicts:
	app/models/pull_request.rb
2012-11-09 20:53:55 +06:00
Vokhmin Alexey V b39ccea0d5 add show logs in real time 2012-11-09 17:08:56 +04:00
Vokhmin Alexey V eb40fbbbd5 removed unnecessary fields for build ISO 2012-11-07 16:14:31 +04:00
Vokhmin Alexey V 6a7035d551 added #show action for product_build_list 2012-11-06 22:01:54 +04:00
Vokhmin Alexey V e39ca302d7 #new action for build ISO - done. 2012-11-06 21:17:44 +04:00
Vokhmin Alexey V b1722cae75 added some params for build ISO 2012-11-06 20:19:52 +04:00
Vokhmin Alexey V 317f672e32 added #new action for create ISO build 2012-11-06 19:08:54 +04:00
Vokhmin Alexey V ecec330b4d added migration, updated models, UI 2012-11-06 18:13:16 +04:00
Alexander Machehin 58a9c68951 [refs #90] fixed rendering a new pull 2012-10-28 00:44:42 +06:00
Alexander Machehin 95e5804358 [refs #90] fixed git timeout error on the big diff 2012-10-26 20:03:46 +06:00
Alexander Machehin ba74024b29 fixed order of the handle exceptions 2012-10-25 15:42:47 +06:00
Vokhmin Alexey V 05f16c1d13 #709: updated controller and view for fixing undefined local variable or method 'project_counter' 2012-10-22 12:26:00 +04:00
Vladimir Sharshov daefb27f95 Merge pull request #707 from warpc/706-get-list-of-projects-by-repository
[refs #706:] REST API repository: list of repository projects.
2012-10-19 09:10:06 -07:00
Vokhmin Alexey V 25620af00c hot fix for specs 2012-10-19 19:35:19 +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
Vladimir Sharshov 00e92d9672 Merge pull request #678 from warpc/579-code_line_comments
[refs #579] code line comments
2012-10-19 07:48:50 -07:00
Vokhmin Alexey V 18ac16ae96 #698: small refactoring, added ckeck for main platform 2012-10-19 18:03:09 +04:00
Vokhmin Alexey V b9f1835d1c Merge branch 'master' into 698-rest-api-for-advisories 2012-10-19 17:58:38 +04:00
Vokhmin Alexey V 4680e9c62c #706: added #projects action to Repositories API 2012-10-19 17:52:36 +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 d563c9a9f9 #702: added handling errors 2012-10-19 15:47:49 +04:00
Vokhmin Alexey V 0cf0933074 #698:small refactoring 2012-10-19 11:32:12 +04:00
Vokhmin Alexey V 5cf69bff92 #698: renamed method 2012-10-18 20:36:29 +04:00
Vokhmin Alexey V 8bbb82faa8 #698: updated Advisories API 2012-10-18 20:25:24 +04:00
Vokhmin Alexey V 84e5f3ead3 #698: updated specs, permission access 2012-10-18 19:44:28 +04:00
Vokhmin Alexey V d5ad5b1a95 Merge branch 'master' into 698-rest-api-for-advisories 2012-10-18 18:59:00 +04:00
Vokhmin Alexey V a3252594b8 #698: fixed #index action in Advisories controller 2012-10-18 18:32:43 +04:00
Vokhmin Alexey V 68dbae8c83 #698: added #create and #fork actions for Advisories API 2012-10-18 18:17:50 +04:00
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
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 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 432e219571 #692: some refactoring 2012-10-16 17:42:52 +04: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 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
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
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
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
Vokhmin Alexey V 9087a15627 #672: small refactoring Api::V1::BaseController#member method 2012-10-15 14:07:10 +04: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 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
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 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 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 824ee79452 [refs #579] redirect to created comment 2012-10-08 15:20:45 +06:00
Alexander Machehin ed7aec602f [refs #579] alpha version of the pull inline comments 2012-10-06 01:19:05 +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 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 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06: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 cb994c6fd6 #349: created autocompletes_controller, refactoring, updated specs 2012-10-02 20:54:55 +04:00
Alexander Machehin b3fd95d7fa [refs #90] always redirect to pull on update action 2012-10-02 21:27:15 +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
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
Alexander Machehin f92f209323 [refs #90] fixed changing base project 2012-10-01 23:43:15 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Alexander Machehin 90069b2fb6 [#refs #90] fix pull flashes 2012-09-28 23:45:27 +06:00
Alexander Machehin fbc537174e [refs #90] search base project by fullname 2012-09-28 21:39:45 +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 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 a20e1552cc [refs #374] Fix test, small refactoring. 2012-09-27 16:13:59 +04:00
Vladimir Sharshov 0dd103b7f4 [refs #374] Fix build list tests, remove unused code. 2012-09-27 03:54:56 +04: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 a994e7dd74 Merge remote-tracking branch 'origin/90-pull' into 90-pull 2012-09-26 23:10:45 +06:00
Alexander Machehin 4100b875bd [refs #90] fixed access 2012-09-26 23:10:04 +06:00
Alexander Machehin cc05fa695a [refs #90] fixed pull abilities part 2 2012-09-26 23:09:29 +06:00
Vokhmin Alexey V 37fbb4632e #90: updated branch 2012-09-26 21:04:12 +04:00
Vokhmin Alexey V 613db04375 #90: added limit for commits into the pull request 2012-09-26 21:00:58 +04:00
Vokhmin Alexey V 6f889b15a9 #90: added access to show pull requests 2012-09-26 19:39:47 +04:00
Vokhmin Alexey V 37c9a906c4 Merge branch '90-pull' into 90-separate-issues-and-pull-requests 2012-09-26 18:45:26 +04:00
Vokhmin Alexey V 6070c276f6 Merge branch 'master' into 90-pull 2012-09-26 18:33:04 +04:00
Vokhmin Alexey V 07b27b934f #90: updated #index page for pull-requests 2012-09-26 15:46:23 +04:00
Alexander Machehin dbf1a5f8ca Merge remote-tracking branch 'origin/90-pull' into 90-pull 2012-09-26 15:27:54 +06:00
Alexander Machehin 3491492c8d [refs #90] fixed pull authorization 2012-09-26 15:24:46 +06:00
Vokhmin Alexey V 397d411252 #90: added #index action, updated routes 2012-09-26 00:50:40 +04:00
Vokhmin Alexey V 0299c069c6 #90: style changes for header, increase performanse for #autocomplete_base_project action 2012-09-25 19:18:22 +04: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
Vladimir Sharshov 06099a15b6 Merge pull request #657 from warpc/648-add-filters-to-projects-page
[refs #648]: Filters by owners in projects page
2012-09-25 03:41:11 -07:00
Vladimir Sharshov c426f81abe Merge pull request #656 from warpc/616-issues_and_comments
[refs #616] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
2012-09-25 03:37:44 -07:00
Vokhmin Alexey V 84378afc3d #648: small code optimization 2012-09-25 13:36:50 +04:00
Vokhmin Alexey V 768f4b1dfb #648: renamed parametr 2012-09-24 22:07:53 +04:00
Vokhmin Alexey V 9be978eb68 #648: updated models, JS, controller according to comments and discussions 2012-09-24 22:04:53 +04:00
Alexander Machehin 2c6d4bae9e [refs #616] add error messages to ajax 2012-09-24 23:34:14 +06:00
Alexander Machehin f4bbeaaa46 [refs #616] fixed 500 when failed to create comment 2012-09-24 23:01:04 +06:00
Vokhmin Alexey V cee1ee6cb6 #648: small refactoring 2012-09-23 20:22:49 +04:00
konstantin.grabar 7812adfdbc [refs #374] Add custom http basic auth for api 2012-09-21 23:15:56 +04:00
Vokhmin Alexey V 2406423483 #648: added filters to Projects page 2012-09-21 21:57:22 +04:00
konstantin.grabar 5bcebcf384 [refs #374] Add publish_without_qa field, fix some specs, update docs for auth 2012-09-21 18:30:40 +04:00
konstantin.grabar e94c6f4f00 [refs #374] Merge master into 374-rest_api_for_builds 2012-09-21 13:20:04 +04:00
Vokhmin Alexey V 799a1464fb #385: fixed 2012-09-20 18:26:26 +04:00
Vokhmin Alexey V 07f5224e76 #385: removed before_filter 2012-09-20 15:21:54 +04:00
Vokhmin Alexey V c76618441e #385: revert some changes according to discussion 2012-09-20 15:10:52 +04:00
Vokhmin Alexey V 9d2c9ae2b3 #385: added rsa to name of archives for git branches 2012-09-20 00:38:40 +04:00
Vokhmin Alexey V f39adfd2f7 #385: fixed specs, updated controller, view 2012-09-19 23:29:36 +04:00
Alexander Machehin daf845705a [refs #616] comment update 2012-09-19 00:42:22 +06:00
Alexander Machehin a492367a17 [refs #616] some fixes and refactoring 2012-09-18 16:00:21 +06: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 fe20814b5a #633: hot fix 2012-09-13 20:18:09 +04:00
Vokhmin Alexey V a99bfee4a6 #633: UI has been updated 2012-09-13 20:08:41 +04:00
Vladimir Sharshov 5a699ad379 Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
[refs #638] Repository supervisor
2012-09-12 13:52:42 -07:00
Vokhmin Alexey V 1c9a9e803e #638: some refactoring 2012-09-13 00:47:39 +04:00
Vokhmin Alexey V 1a75a5a394 #638: updated Relation model, repositories and platforms controllers according to comments 2012-09-12 23:32:51 +04:00
Vladimir Sharshov e3bcd2382e [refs #641] Show only public projects in group profile 2012-09-12 18:49:40 +04:00
Vokhmin Alexey V 3b622f54b9 #638: added before_filter to repositories_controller 2012-09-12 17:43:02 +04:00
Vokhmin Alexey V bc4043e558 #638: hot fix 2012-09-12 17:25:46 +04:00
Vokhmin Alexey V b468b09529 #638: some refactoring for adding new user 2012-09-12 17:07:34 +04:00
Vokhmin Alexey V 1e40b9fb06 #638: some refactoring 2012-09-12 00:08:25 +04:00
Vokhmin Alexey V 3858bfa6b7 #638: added members to repository model, updated views 2012-09-11 19:30:14 +04:00
Vokhmin Alexey V 5f941844f2 #637: added migration, updated approve_notification 2012-09-10 15:08:53 +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 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
Vladimir Sharshov 2c1df5cd14 Merge branch 'master' into 263-refactoring
Conflicts:
	config/deploy.rb
	db/schema.rb
2012-09-06 21:14:14 +04:00
Vladimir Sharshov 54c6ba55be [refs #349] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules 2012-09-06 21:09:10 +04:00
Vokhmin Alexey V c1d87a36da #631: fixed misprint in model and controller 2012-09-06 19:43:07 +04:00
Vokhmin Alexey V 71d14e43d6 #631: fixed misprint 2012-09-06 19:39:26 +04:00
Vokhmin Alexey V 4d1166e6b3 #631: updated UI and JS validation for build_lists, rewrote migration 2012-09-06 19:34:33 +04:00
Vokhmin Alexey V f0f11cb9dc #631: added #edit #update actions to platforms/repositories_controller, wrote migration, updated models 2012-09-06 17:43:50 +04:00
Vladimir Sharshov 698e55e3e8 [refs #263] Test refactoring 2012-09-06 14:53:03 +04:00
konstantin.grabar b9a622acec [refs #374] Add unixtime search and output. Fix rate limit configuration and 404 status 2012-09-05 17:47:25 +04:00
Vladimir Sharshov ec32cf7fa0 [refs #630] swap tour conten for porject and build pages 2012-09-04 18:30:02 +04:00
konstantin.grabar ff8f9da14f [refs #374] Refactor api build list create method 2012-09-04 16:44:28 +04:00
konstantin.grabar 5d0d972a0d [refs #374] Refactor api build lists create logic 2012-09-03 17:49:11 +04:00
George Vinogradov 3e69d7d0f4 [issue #349] Guest user can show open platforms. 2012-09-01 02:00:39 +04:00
Vladimir Sharshov ff20c0b199 Merge pull request #622 from warpc/620-maintainer_db
[refs #620] Maintainer DB
2012-08-31 11:50:02 -07:00
George Vinogradov decd4bf293 [issue #620] Removed scope from BuildList::Package && small refactoring. 2012-08-31 21:47:52 +04:00
konstantin.grabar 6229daf137 [refs #374] Add paginate restriction for API 2012-08-31 16:23:44 +04:00
George Vinogradov 68b86ba09a [issue #620] Fixed migration && BuildList#actualize_packages. 2012-08-30 22:32:28 +04:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
konstantin.grabar 03986b7c21 [refs #374] Remove index actions from projects and reps. Add projects#get_id. Update tests. Fix build list show template 2012-08-28 20:57:12 +04:00
George Vinogradov 6c4b13f0da [issue #620] Removed project_maintainer & assignee 2012-08-28 18:25:57 +04:00
George Vinogradov f688985814 [issue #620] Changed maintainer assignment.
*  Added `project:maintainer:set_to_owner` task to set projects maintainer
     to its owner
  *  Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
Alexander Machehin 1c3ca85f03 [refs #616] add comment for clarity 2012-08-27 15:43:44 +06:00
Alexander Machehin 2c0826a77d [refs #616] fixed showing body after update 2012-08-25 23:40:51 +06:00
Alexander Machehin 4b4007651d [refs #616] small refactoring issues controller 2012-08-25 23:38:11 +06:00
Alexander Machehin e8d80b849a [refs #616] fixed removing labels from issue 2012-08-25 21:26:24 +06:00
George Vinogradov f6cc919f2f [issue #620] Removed MaintainersController#assignee 2012-08-24 23:45:58 +04:00
George Vinogradov d24a149d9a [issue #620] Added search of maintainer by package 2012-08-24 20:06:59 +04:00
George Vinogradov 2fbb72e537 [issue #620] Changes in Maintainer db:
*  Added maintainer selection on project page (see TODO in sources);
  *  Added `actual` field to BuildList::Package;
  *  Added rake task to set BuildList::Package.actual field.
     Run it after migration (see TODO in sources);
  *  Packages after publising of BuildList becomes actual;
  *  Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
Pavel Shved 629e227d9a Fix Maintainers spec for anons
it doesn't create guest user now, and relies on anonymous_access
config variable instead.
2012-08-22 00:02:34 +04:00
Pavel Shved 028e511409 Remove 'heavy' rescues from maintainer-db api 2012-08-22 00:02:33 +04:00
Pavel Shved 8629d67030 Add javascript callback for "assignee"
To make intrgration with external trackers easier, add JS API for
assignee retrieval.  It returns a script that calls a function that
should act somehow depending on how it was defined.
2012-08-21 23:58:15 +04:00
Pavel Shved e75a676895 Add "assignee" JSON callback
The callback reports the assignee of a package in a platform given.
Used for integration with external bug trackers.
2012-08-21 23:58:15 +04:00
Pavel Shved 388a0028da Add Maintainer Database and list view for it
This commit adds list of maintainers of a platform to page
/platforms/:id/maintainers.  This list is intended to serve as a
counterpart for http://maint.mandriva.com/listpkgs.php.

The commit adds a "view" on a build_list_packages table: it selects only
the latest builds for each package, and summarizes the information about
such packages in "maintainers" table.

This is a testing mode only, so the link to maintainers table is not
shown.
2012-08-21 23:57:39 +04:00
konstantin.grabar 5dc50056df [refs #374] Add repositories, platforms and projects read API 2012-08-21 14:19:38 +04:00
Alexander Machehin 1142f9ee8c [refs #616] fixed searching collaboratots to assignment 2012-08-20 23:37:22 +06:00
George Vinogradov 84328742e4 [issue #590] Log returns through Rails with `tail -n` 2012-08-17 12:23:49 +04:00
konstantin.grabar 6d4e369322 [refs #374] Change project_version set method 2012-08-16 15:11:46 +04:00
konstantin.grabar 554950a14c [refs #374] Fix some tests. Comment 500 error cautch 2012-08-15 19:58:22 +04:00
Pavel Chipiga 0ff8f92b62 Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263 2012-08-15 16:52:32 +03:00
konstantin.grabar 9712683c62 [refs #374] Change commit_hash save on create. Continue specs refactor 2012-08-14 17:45:21 +04:00
konstantin.grabar 7fba004858 [refs #374] Api tests refactor 2012-08-13 13:58:26 +04:00
Alexander Machehin b2ff7326d1 Merge branch 'master' into 90-pull
Conflicts:
	config/locales/en.yml
	config/locales/ru.yml
2012-08-13 15:01:43 +06:00
Alexander Machehin c1c9f9680e [refs #90] remove code duplication 2012-08-10 22:40:09 +06:00
Vladimir Sharshov e535ff2fed Merge pull request #611 from warpc/590-build_list_page_change
[refs #590] Dirty hack to fix BuildList#index
2012-08-10 09:26:11 -07:00
George Vinogradov e7407ae28f [issue #590] Dirty hack to fix BuildList#index 2012-08-10 19:08:26 +04:00
Vladimir Sharshov 45169faf2f Merge pull request #609 from warpc/590-build_list_page_change
[refs #590] add time notification and periodic page update
2012-08-09 14:49:12 -07:00
Alexander Machehin 1d5470b7d6 [refs #90] small fixes 2012-08-09 23:56:55 +06:00
konstantin.grabar 134b386631 [refs #374] Fix api and build_lists tests 2012-08-09 18:38:41 +04:00
konstantin.grabar 1728148d38 [refs #374] Small api actions refactor 2012-08-08 23:16:27 +04:00
konstantin.grabar 0c9f3540f9 [refs #374] Merge master into 374-rest_api_for_builds 2012-08-08 18:21:56 +04:00
konstantin.grabar 7f475948f6 [refs #374] Uncomment 404/500/503 rescues 2012-08-08 18:08:56 +04:00
konstantin.grabar e0ee7bd086 [refs #374] Add jbuilder responses for api 2012-08-08 17:02:51 +04:00
Alexander Machehin edf882f2a1 [refs #90] remove unneeded method 2012-08-08 00:17:10 +06:00
Alexander Machehin 6225410720 [refs #90] enable check for uniq pull requests 2012-08-08 00:06:49 +06:00
Alexander Machehin 61b02ce1e8 [refs #90] fixed error on create 2012-08-08 00:05:43 +06:00
Alexander Machehin e97c3dc645 [refs #90] small controller refactor 2012-08-07 22:34:22 +06:00
Alexander Machehin 2a6b08c269 [refs #90] fixed error with wrong treeish 2012-08-07 22:24:47 +06:00
Alexander Machehin a316105e9c Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-07 18:21:04 +06:00
George Vinogradov 61ca25a820 [issue #590] Eager loading of BuildList's owner and repository. 2012-08-07 01:41:57 +04:00
Alexander Machehin fb66b74019 [refs #90] fixed pull abilities 2012-08-07 00:12:15 +06:00
George Vinogradov 710fef1f0b Merge pull request #602 from warpc/601-add_status_check_for_product_bl_remove
[refs #601] Add status check for destroy action in product build list
2012-08-06 08:40:43 -07:00
Vladimir Sharshov dd1bf7719f [refs #601] Add statuscheck for destroy action in product build list(small fix) 2012-08-06 17:08:13 +04:00
konstantin.grabar 43d8e2020c [refs #374] Remove states check logic from ability.rb. Small api reject answer fix 2012-08-06 16:21:19 +04:00
Vladimir Sharshov c7a3addfb8 [refs #601] Add statuscheck for destroy action in product build list 2012-08-06 16:06:42 +04:00
Vladimir Sharshov 0e3e5c0ce1 Merge pull request #600 from warpc/590-build_list_page_change
[refs #590] build list page change:
* Fix migration;
* Repository rights checking moved to controller;
* Repository fetches through project and platform.
2012-08-06 04:18:26 -07:00
George Vinogradov 94178c6ee3 [issue #590] Removed unnecessary check from controller. 2012-08-06 15:03:10 +04:00
George Vinogradov b963c9342a [issue #590] Repository fetches through project and platform 2012-08-06 14:59:07 +04:00
George Vinogradov 36de270fad [issue #590] Moved repository check to controller. 2012-08-06 14:21:33 +04:00
Alexander Machehin 6a04f4ad7a Merge again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-06 11:19:06 +06:00
George Vinogradov a1b7bcac32 [issue #565] Merge branch 'master' into 565-feedback_form
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +04:00
George Vinogradov 6eff6bffa5 [issue #590] Merge branch 'master' into 590-build_list_page_change
Conflicts:
	db/schema.rb
2012-08-03 18:37:44 +04:00
konstantin.grabar f3db00832a [refs #374] Api v1 base functional and specs 2012-08-03 14:05:05 +04:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
konstantin.grabar 931d4a7db0 [refs #441] Key Pairs fixes and refactoring 2012-07-31 16:50:53 +04:00
Vladimir Sharshov 43309d86e6 Merge branch 'master' into 441-key_pairs, fix schema, add migration
Conflicts:
	db/schema.rb
2012-07-31 02:02:15 +04:00
Vladimir Sharshov 89d67f9ea6 [refs #441] Refactring, fix errors 2012-07-30 23:08:14 +04:00
Alexander Machehin 6c11597de6 Merge branch 'master' into 90-pull 2012-07-30 16:53:59 +06:00
konstantin.grabar f674735c8c [refs #374] Merge master into 374-rest_api_for_builds 2012-07-30 13:31:28 +04:00
George Vinogradov 63801e2676 [issue #590] Platform fetches through repository. 2012-07-27 23:37:56 +04:00
George Vinogradov cc66e2ee4a [issue #590] Save repository to save to in BuildList. 2012-07-27 20:01:26 +04:00
Vladimir Sharshov 255bd3a73a Merge pull request #589 from warpc/551-old_bugs_with_by_object
[refs #551] by_object changed to by_actor.
2012-07-27 06:45:34 -07:00
Alexander Machehin 25bdbb01d6 [refs #90] project fullname 2012-07-27 18:52:31 +06:00
Vladimir Sharshov 2105457d62 Merge pull request #587 from warpc/586-datatables_json_fixes
[refs #586] Custom JSON generators changed to JBuilder
2012-07-27 05:45:23 -07:00
George Vinogradov bbb03d3243 [issue #586] Removed @total_project & @total_user. 2012-07-27 16:40:13 +04:00
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
Vladimir Sharshov 5aecdc203b Merge pull request #571 from warpc/263-refactoring
[refs #263] Big git refactoring
2012-07-27 04:51:34 -07:00
George Vinogradov 40b0bb4b58 [issue #551] by_object changed to by_actor. 2012-07-27 08:12:09 +04:00
Pavel Chipiga fb60dac748 Merge branch 'master' into 263-refactoring
Conflicts:
	db/schema.rb
2012-07-27 00:19:36 +03:00
Pavel Chipiga 35e673d44e Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263 2012-07-27 00:15:57 +03:00
George Vinogradov 03cc4668dc [issue #586] Custom JSON generators changed to JBuilder 2012-07-27 00:25:44 +04:00
konstantin.grabar 48f8c3ad08 [refs #374] Add json responses for build lists api 2012-07-26 13:22:51 +04:00
George Vinogradov 6f4f48cbce [issue #578] Fixed error handling in PresonalRepository. 2012-07-26 01:49:55 +04:00
Pavel Chipiga e09a9467e2 Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576 2012-07-25 21:05:25 +03:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
George Vinogradov 6d046764ef [issue #565] Merge branch 'master' into 565-feedback_form
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-07-20 20:15:55 +04:00
George Vinogradov d6c65a1626 [issue #565] Added feedback form.
*  Added web pages to send request
*  Added mailer to send feedback message.
2012-07-20 20:06:31 +04:00
Pavel Chipiga 611b22baa5 Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263 2012-07-17 11:02:56 +03:00
Alexander Machehin 2feb03601b [refs #90] fixed authorize of the merge action 2012-07-16 22:35:44 +06:00
konstantin.grabar 3cf3546c2e [refs #441] Add secret to filter. Add repository key exist check 2012-07-13 18:16:56 +04:00
konstantin.grabar b4059c67fc [refs #441] Add key pairs for platform 2012-07-13 15:18:12 +04:00
Alexander Machehin 26617b7739 [refs #90] add close/reopen button 2012-07-12 20:15:28 +06:00
Alexander Machehin 3290adb0b1 [refs #90] fixed merge ability 2012-07-10 22:58:39 +06:00
Alexander Machehin 43d2c1b223 [refs #90] fix after fail of the pull creation 2012-07-10 22:10:24 +06:00
Alexander Machehin 4663babac6 [refs #90] redirect to right place after create 2012-07-10 21:48:11 +06:00
Alexander Machehin 65c139b922 [refs #90] dont show empty projects 2012-07-10 19:29:10 +06:00
Alexander Machehin 10b828c644 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
	vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
Vladimir Sharshov c45e599eb0 Merge pull request #560 from warpc/442-mass_build
[refs #442] Add tests for mass builds and attr_accessible. Fix ability.
2012-07-10 02:49:23 -07:00
George Vinogradov 8c5a8c884d [issue #561] Some DB query optimization. 2012-07-10 01:13:55 +04:00
George Vinogradov 7b3c74e97d [issue #561] Changed BuildList pages
*  Removed mass_build, cancel and updated_at fields from list
*  Added link to commit in list (instead of version)
*  Added platform field in list
*  Added filter by main platforms
*  Added cancel button and mass_build field to BuildList#show
2012-07-10 01:09:27 +04:00
konstantin.grabar adc917ca3b [refs #442] MassBuild data initialize refactor 2012-07-09 20:13:02 +04:00
konstantin.grabar c6600054d1 [refs #442] Change platform and user set to platform_id and user_id 2012-07-09 17:17:02 +04:00
Alexander Machehin dd221cc880 [refs #90] autocomplete 2012-07-06 23:30:01 +06:00
George Vinogradov c1a90872db [issue #428] Fixed bug with before_filter in advisory 2012-07-06 18:23:49 +04:00
George Vinogradov 49927728cd [issue #428] Fetching packages moved to particular method. 2012-07-06 17:31:18 +04:00
George Vinogradov 3c8b77027e [issue #428] Allowed any update_types when build for released platform. 2012-07-06 03:05:47 +04:00
George Vinogradov 69d48f000e [issue #428] Removed commented code. 2012-07-05 11:36:18 +04:00
George Vinogradov db66c7b3e1 [issue #428] Attempt to fix duplication in packages list 2012-07-04 22:01:06 +04:00
George Vinogradov 1c4c91df5c [issue #428] Fixed attaching projects to advisory. 2012-07-04 21:38:45 +04:00
George Vinogradov 8c9cca39ef [issue #428] Attempt to fix packages listing 2012-07-04 20:52:22 +04:00
George Vinogradov 02ae717af9 [issue #428] Fixed bug with compact! and uniq! 2012-07-04 18:57:23 +04:00
Alexander Machehin 9e68dae63b [refs #90] fixed autocomplete for new pull 2012-07-04 20:36:52 +06:00
George Vinogradov a909a92ae8 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	db/schema.rb
2012-07-04 18:10:03 +04:00
George Vinogradov f6cf8373e5 [issue #428] Removed fetching of all Advisories. 2012-07-04 17:28:43 +04:00
konstantin.grabar 82612c368d [refs #442] Move mass_builds to platforms dir 2012-07-04 16:15:12 +04:00
George Vinogradov 8c88e7a0da [issue #428] Some code simplification. 2012-07-04 15:42:43 +04:00
konstantin.grabar 4eac2a232f [refs #442] Ability rights refactor. status_by_human refactor 2012-07-04 15:22:26 +04:00
George Vinogradov 7515f3515d [issue #428] Fixed refs in advisory preview 2012-07-04 03:44:30 +04:00
George Vinogradov e00e88340b [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
2012-07-04 03:31:51 +04:00
George Vinogradov 094f25c049 [issue #428] Changed attaching advisory to BuildList.
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
Alexander Machehin 54f3c63e68 [refs #90] removed logger 2012-07-04 00:17:15 +06:00
Alexander Machehin 89abd20c95 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar 0827cf5100 [refs #442] Add other mass builds action to mass_builds controller. Rename cancel_mass_builds action 2012-07-03 18:34:07 +04:00
konstantin.grabar 8f9a6ee2d2 [refs #442] Change cancel btn. Move some actions to mass_builds controller. Add more ability rights 2012-07-02 18:50:47 +04:00
konstantin.grabar 6507ad280f [refs #442] Merge master into 442-mass_build 2012-06-29 16:40:54 +04:00
Vladimir Sharshov 7561abca08 [refs #462] refactoring: remove notified_at 2012-06-28 21:40:32 +04:00
Vladimir Sharshov 46161253ab [refs #462] Product status does not change 2012-06-28 19:54:58 +04:00
konstantin.grabar ce163f89a9 [refs #442] Add rep_name field. Add cancel builds ability 2012-06-28 19:23:33 +04:00
Alexander Machehin ef945278e8 [refs #90] refactoring check methods 2012-06-28 19:47:29 +06:00
konstantin.grabar 10aed58bdd [refs #442] Small refactor. Remove bootstrap collapse 2012-06-28 15:31:25 +04:00
konstantin.grabar b6d769ad66 [refs #442] Change mass builds table 2012-06-27 18:07:05 +04:00
Alexander Machehin b857a2d09e [refs #90] remove debug to cancan 2012-06-27 17:21:31 +06:00
Alexander Machehin ce0ff70561 [refs #90] fixed errors 2012-06-27 16:47:08 +06:00
Alexander Machehin 1ffb1b3940 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/models/project.rb
	db/schema.rb
2012-06-27 16:20:38 +06:00
Alexander Machehin 6aa9cfaa50 [refs #90] view pull status 2012-06-25 22:04:43 +06:00
konstantin.grabar 651dd57044 Merge branch 'master' into 442-mass_build 2012-06-25 18:29:16 +04:00
konstantin.grabar f3bd3bbd7f [refs #442] Add mass build counters ant their update. Add failed builds report generate 2012-06-22 19:10:44 +04:00
konstantin.grabar edcc0c996f Merge branch 'master' into 442-mass_build 2012-06-22 13:20:50 +04:00
konstantin.grabar 10efb2401a [refs #442] Fix auto_publish select 2012-06-21 17:49:20 +04:00
konstantin.grabar 5e3241a1f5 [refs #525] Rename erase to clear. Fix flash. Replace repository to platform in locales 2012-06-21 11:15:26 +04:00
konstantin.grabar 3ebd36f6fe [refs #525] Erase corrections and refactor 2012-06-20 22:02:42 +04:00
George Vinogradov e4f62ea592 [issue #428] Added filter by advisory_id to Advisories 2012-06-20 21:51:08 +04:00
George Vinogradov 3d38adcb94 [issue #428] Added Atom feed to advisories. 2012-06-20 18:44:32 +04:00
konstantin.grabar 270dbf2e9b [refs #525] Add erase repository functional 2012-06-20 17:21:32 +04:00
George Vinogradov 01b8f3b5c5 [issue #428] Fixed typo 2012-06-20 00:32:56 +04:00
George Vinogradov 60f1f68ce1 [issue #428] Fixed schema.rb . Removed debug code. 2012-06-20 00:04:33 +04:00
konstantin.grabar dc8a11fa68 [refs #505] Merge master into 505-state_machine_migrate 2012-06-19 13:43:38 +04:00
George Vinogradov 735afaea15 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	db/schema.rb
2012-06-19 02:57:39 +04:00
George Vinogradov ecd4498484 [issue #428] Changes in advisories.
*  Added Many2Many relation between advisories and projects.
*  Added autocompletion to build list's advisory
*  Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
Pavel Chipiga cb8345a207 Rename and separate queues. Refs #510 2012-06-18 17:16:53 +03:00
Pavel Chipiga 73ec2ec5e9 Fix typo. Refs #510 2012-06-18 14:38:25 +03:00
Pavel Chipiga f19e82b3fc Add comments for async method calls. Refs #510 2012-06-17 01:51:02 +03:00
Pavel Chipiga b47b4ec075 Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510 2012-06-16 21:27:46 +03:00
konstantin.grabar ac7a3980cd [refs #505] Pending some tests. Return set_version_and_tag. Fix post_build action 2012-06-15 20:05:55 +04:00
konstantin.grabar 5e7342fbd7 [refs #505] Comment DJ stub. Fix event name call 2012-06-15 12:47:40 +04:00
konstantin.grabar 5acc13e9a6 [ref #505] Refactor set_version_and_tag. Rename success and error events 2012-06-14 17:36:40 +04:00
konstantin.grabar 76b261638f Merge master into 505-state_machine_migrate 2012-06-14 10:34:55 +04:00
konstantin.grabar 17815ddab2 [refs #505] Change start event name and move some logic to set_version_and_tag method 2012-06-13 22:33:23 +04:00
Alexander Machehin 682f33a9bf [refs #90] view merged status 2012-06-13 23:52:11 +06:00
konstantin.grabar 9b3da14f83 [refs #505] Add more events and replace hand made status change 2012-06-13 21:27:35 +04:00
konstantin.grabar f37e0e54a3 [refs #510] Replace dj with resque 2012-06-09 16:52:29 +04:00
Alexander Machehin 9af3d22153 [refs #90] auto close after manual merge 2012-06-09 15:09:38 +06:00
Alexander Machehin 8fadbf2d41 [refs #90] rewrite diff 2012-06-07 23:23:28 +06:00
George Vinogradov 863213767b [issue #428] Fixed typos. Removed unnecessary parts. 2012-06-05 19:58:11 +04:00
Alexander Machehin 614691a737 [refs #90] removed index action 2012-06-05 18:10:51 +06:00
Alexander Machehin 91bf65d65d [refs #90] comments for pull requests (slow version) 2012-06-05 18:08:52 +06:00
George Vinogradov e7c0eab736 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov abe2b8a30d [issue #428] Work with existing advisories.
*  Added advisories page to platform
*  Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
Alexander Machehin 4b8def5bd0 [refs #90] add pulls to tracker 2012-06-04 23:00:19 +06:00
Alexander Machehin 60aba754ae [refs #90] pull title/body update 2012-05-31 22:57:52 +06:00
Alexander Machehin ca72504ca2 [refs #90] new/show actions refactoring 2012-05-31 17:23:30 +06:00
Alexander Machehin f44b9631ad [refs #90] add pull requests authorizations 2012-05-31 00:08:07 +06:00
Alexander Machehin 5c9f914e4a [refs #511] add issue index authorization 2012-05-30 22:03:07 +06:00
Alexander Machehin 26baf999f4 [refs #90] diff stats 2012-05-29 23:09:43 +06:00
konstantin.grabar 8eaec85aff [refs #442] Fix auto_publish validate and default set 2012-05-29 17:44:30 +04:00
Alexander Machehin 11c67fb07d Revert "[refs #90] issue status -> state" & changed state -> status
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.

Conflicts:

	app/controllers/projects/issues_controller.rb
	db/migrate/20120412173938_create_pull_requests.rb
	db/schema.rb
2012-05-29 16:50:25 +06:00
konstantin.grabar a446bd38e5 [refs #442] Filter mass builds by platform. Order them by created_at 2012-05-28 19:58:12 +04:00
konstantin.grabar df82cf69ca [refs #442] Refactor mass_build 2012-05-25 21:31:57 +04:00
konstantin.grabar a79d946b6b [refs #442] Mass build refactor and fixes 2012-05-25 19:56:26 +04:00
Alexander Machehin df610931d7 [refs #90] commits tab 2012-05-25 16:48:44 +06:00
Alexander Machehin 4f1d23a2a4 [refs #90] branch, merge validation 2012-05-24 23:10:49 +06:00
Alexander Machehin e211fa2fc3 [refs #90] fixed errors, add validations & tests 2012-05-23 22:09:11 +06:00
konstantin.grabar e835eae50e [refs #442] Remove commented code 2012-05-23 18:36:42 +04:00
konstantin.grabar c74de8b84d [refs #442] Add new page for mass rebuild, new fields and new functional 2012-05-23 18:08:11 +04:00
konstantin.grabar 7c45263799 [refs #442] Add mass build select to monitoring. Remove build lists from build_all action 2012-05-22 17:40:27 +04:00
konstantin.grabar 9aefce6b68 [refs #442] Merge master into 442-mass_build 2012-05-21 18:33:12 +04:00
Alexander Machehin d643bb3cd0 [refs #90] try to prevent create same pull 2012-05-21 19:24:16 +06:00
Alexander Machehin 6b6887250b Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-05-21 17:31:49 +06:00
konstantin.grabar be2ab9154c [refs #442] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes 2012-05-21 14:18:29 +04:00
Vladimir Sharshov 5133fe6bc3 Merge pull request #487 from warpc/443-tour
[refs #443] invite localization
2012-05-18 11:10:15 -07:00
Alexander Machehin aad7a3a547 [refs #443] invite localization 2012-05-18 22:54:57 +06:00
konstantin.grabar cd3564bb81 [refs #442] Add mass build model and new build_all fixes 2012-05-18 19:12:51 +04:00
Pavel Chipiga b41a9e3b49 Redo project assign for build_list_packages. Redo and fix double render error during build_list publish. Refs #444, #481 2012-05-18 00:19:57 +03:00
Vladimir Sharshov bfabdc1dc3 Merge pull request #468 from warpc/466-edit_project
[refs #466] fixed access to project and tests for this cases.
2012-05-17 13:11:55 -07:00
Alexander Machehin fcffff4178 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	config/locales/title.en.yml
	config/locales/title.ru.yml
	config/routes.rb
	db/schema.rb
2012-05-17 22:58:29 +06:00
Alexander Machehin 74aee232f9 [refs #90] some fixes and merge button 2012-05-17 22:49:29 +06:00
konstantin.grabar 3e57359c96 [refs #442] Add mass build page functional 2012-05-17 19:20:03 +04:00
Alexander Machehin 59acdf4f44 [refs #443] fixed setting language 2012-05-17 16:28:58 +06:00
Vladimir Sharshov 2b5115df78 Merge pull request #477 from warpc/443-tour
[refs #443] fixed error whis empty accept languages
2012-05-16 12:02:19 -07:00
Alexander Machehin 8facb45bb7 [refs #443] fixed error whis empty accept languages 2012-05-16 23:20:42 +06:00
Alexander Machehin f96990bd25 [refs #90] change view 2012-05-16 22:50:30 +06:00
Vladimir Sharshov 2892689807 Merge pull request #469 from warpc/443-tour
[refs #466] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
Alexander Machehin 4f7ccbb4a9 [refs #443] fixed preferred language 2012-05-16 15:48:42 +06:00
Alexander Machehin 05746ea449 [refs #466] add i18n 2012-05-15 21:35:48 +06:00
Alexander Machehin 2ae66d6ae4 [refs #466] fixed access to project 2012-05-15 17:18:43 +06:00
Pavel Chipiga 06191eb12a Quickfix for status_build. Refs #444 2012-05-15 01:15:48 +03:00
Pavel Chipiga 8470674c62 Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444 2012-05-14 22:08:31 +03:00
Alexander Machehin ff016efe1c [refs #90] choose project 2012-05-14 23:09:18 +06:00
Alexander Machehin bd2bb2b91f [refs #90] fixed merge 2012-05-12 22:34:27 +06:00
Alexander Machehin 85d4489009 [refs #90] dont work pull 2012-05-12 00:23:09 +06:00
Alexander Machehin 5f5eb00c4f [refs #443] abf tour 2012-05-12 00:15:20 +06:00
George Vinogradov 5320fc2d3e [issue #428] AdvisoriesController moved from its scope 2012-05-10 21:17:59 +04:00
George Vinogradov f8d32495b8 [issue #428] Added title. Changed BuildListsController#update 2012-05-10 19:15:50 +04:00
Alexander Machehin 4040a486fe [refs #90] fix diff 2012-05-10 18:32:54 +06:00
Pavel Chipiga 52f5e01575 Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428 2012-05-06 00:43:04 +03:00
Vladimir Sharshov 8819d0845a [refs 428] Fix tests and merges missing 2012-05-05 23:26:34 +04:00
George Vinogradov 05ef799fa4 [issue #428] Added advisories list. Added translations. 2012-05-05 21:18:29 +04:00
Alexander Machehin 381ae0a8b9 [refs #90] diff - dont work 2012-05-05 22:57:12 +06:00
George Vinogradov 6fe0e5b530 [issue #428] Added AdvisoriesController & show view. 2012-05-05 02:53:45 +04:00
George Vinogradov 1f07332892 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/controllers/projects/build_lists_controller.rb
	config/routes.rb
	db/schema.rb
2012-05-04 21:29:04 +04:00
Alexander Machehin 813afe53cf [refs #90] minor interface changes 2012-05-04 23:13:41 +06:00
George Vinogradov 8350fc8fb1 [issue 428] Added advisory. 2012-05-04 21:12:51 +04:00
Alexander Machehin c5731ff8dd [refs #90] fixed merging errors 2012-05-04 16:56:11 +06:00
Pavel Chipiga 5157f31081 Refactor routes to separate owner profile and project. Redo short groups profile URL. Improve specs. Refs #236 2012-05-04 00:52:56 +03:00
Alexander Machehin 178dbdc5f0 [refs #90] move files 2012-05-03 23:55:08 +06:00
Alexander Machehin 36b4ce2d99 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects/issues_controller.rb
	app/models/project.rb
	config/locales/menu.en.yml
	config/routes.rb
	db/schema.rb
2012-05-03 23:19:43 +06:00
Pavel Chipiga 45cb90463a Minor members controller refactor. Refs #263 2012-05-03 17:43:23 +03:00
Pavel Chipiga abb60a503a Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263 2012-05-03 17:08:02 +03:00
Alexander Machehin 377035c911 [refs #263] dont change/remove owner from group && tests 2012-05-03 18:25:06 +06:00
Alexander Machehin 9e5db741d3 Merge branch 'master' into 90-pull
Conflicts:
	app/models/project.rb
	db/schema.rb
2012-05-02 23:08:24 +06:00
Pavel Chipiga 2539ef4795 Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263 2012-05-02 12:18:07 +03:00
Pavel Chipiga b957600eda Merge branch 'master' into 263-refactoring
Conflicts:
	app/models/project.rb
	app/views/projects/_repo_block.html.haml
	db/schema.rb
	spec/controllers/issues_controller_spec.rb
	spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
Alexander Machehin 4ad39b05c0 [refs #90] model PullRequest, tests 2012-04-28 23:30:54 +06:00
George Vinogradov de093d7065 [issue #425] Changed object to actor in Relation and to eventable in
EventLog
2012-04-26 05:38:33 +04:00
Alexander Machehin e29a4f30bb [refs #194] fixed checking for AJAX requests 2012-04-25 16:42:36 +06:00
Vladimir Sharshov 41ef7e85f3 Merge pull request #424 from warpc/385-git_archive
[refs #416] dont show zip menu for empty project
[refs #385] Strictly restrict the parameter values(tar or zip)
Add tests for this cases
2012-04-24 11:41:12 -07:00
Alexander Machehin f1cf96baab [refs #385] fixed security bug & added some tests for project archive 2012-04-25 00:10:41 +06:00
Pavel Chipiga cf907c19e8 Merge branch 'master' into 263-refactoring
Conflicts:
	app/controllers/build_lists_controller.rb
2012-04-24 19:06:43 +03:00
Alexander Machehin 1934d5b553 Merge pull request #423 from warpc/347-javascript_refactoring
Fixed CollaboratorsController specs
2012-04-24 08:51:49 -07:00
George Vinogradov 326b35b4f8 [issue #347] Fixed bag with creating collaborator.
Before this changes if we have initialize Collaborator with project_id
and change project, Relation, incapsulated by Collaborator wasn't
changes.
2012-04-24 18:59:50 +04:00
Vladimir Sharshov 93daa25a62 [Refs #421] Fix bug: autopublish build list in released platform 2012-04-24 15:15:04 +04:00
Pavel Chipiga 7af06cc7ab Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263 2012-04-23 23:55:42 +03:00
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Alexander Machehin 628fed40ea [refs #90] issue status -> state 2012-04-23 23:34:11 +06:00
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
2012-04-23 17:58:45 +03:00
Vladimir Sharshov 1684f4a1fc Fix bug: could not update description in personal platform 2012-04-20 22:55:40 +04:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
George Vinogradov 510b0c0c50 [issue #347] Merge branch 'master' into 347-javascript_refactoring
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/group.rb
	app/models/user.rb
2012-04-19 19:32:11 +04:00
Vladimir Sharshov 5b5aec490a Merge pull request #409 from warpc/396-rss_atom_feed
[refs #396] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
konstantin.grabar cd153375dd [refs #396] Devise token auth update for atom feed. Some atom feed fixes. 2012-04-18 19:15:04 +04:00
konstantin.grabar 3d1cb4bfee Merge master into 396-rss_atom_feed 2012-04-18 16:53:53 +04:00
konstantin.grabar 8ef020427d [refs #396] Add token auth for atom feed 2012-04-18 16:46:09 +04:00
George Vinogradov 6c64125787 [issue #408] Changed behavior of build list for released platform 2012-04-17 22:18:39 +04:00
konstantin.grabar 2dafd49763 [refs #396] Add atom feed 2012-04-17 19:01:35 +04:00
George Vinogradov 8204196275 [issue #347] Removed comments. Added filter field to collaborators
table.
2012-04-17 17:39:14 +04:00
Alexander Machehin 2716c19635 [refs #385] add anonymous access to project archive 2012-04-17 16:18:03 +06:00
konstantin.grabar 1b871bf6dd [refs #404] Remove downloads statistics functional 2012-04-17 12:23:58 +04:00
Alexander Machehin 2dedbd92d0 [refs #194] assignee & user 2012-04-14 01:44:04 +06:00
Alexander Machehin ba9184cc49 Merge pull request #398 from warpc/223-build_list_notify_and_duration_updates
223 build list notify and duration updates
2012-04-13 11:43:57 -07:00
Alexander Machehin 5cfadcd723 [refs #385] add dropdown menu to choose archive format 2012-04-13 17:24:24 +06:00
George Vinogradov a68d4a2926 [issue #347] Many changes.
Changes includes:

    *  Changed Collaborator model;
    *  Autocomplete now works through backbone;
    *  Changed autocomplete styles;
    *  Groups have their own avatar;
    *  Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
konstantin.grabar 26a468f6e3 [refs #223] Replace notified_at by updated_at 2012-04-12 16:12:06 +04:00
Alexander Machehin b281cdf65b [refs #385] changed archive 2012-04-12 17:27:15 +06:00
Alexander Machehin 770030e180 [refs #385] zip archive 2012-04-12 00:29:08 +06:00
Alexander Machehin 38eb8aeee5 [refs #391] fixed bug when creation project 2012-04-10 15:40:38 +06:00
Alexander Machehin e349a69883 [refs #353] can fork project to group 2012-04-09 23:56:03 +06:00
George Vinogradov 71c8efabf9 [issue #347] Added backbone. Changed collaborators page. 2012-04-09 21:11:39 +04:00
Pavel Chipiga 679765541e Minor comments controller refactor. Refs #263 2012-04-05 20:21:25 +03:00
Pavel Chipiga 20e5936d0c Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263 2012-04-05 00:43:06 +03:00
Vladimir Sharshov 1ef60a3f94 [Refs #263] Fix copy-past evil 2012-04-03 17:14:08 +04:00
Vladimir Sharshov d382732e68 [Refs #263] Refactoring product. Add tests. 2012-04-03 16:21:39 +04:00
Vladimir Sharshov d31d0c9672 [Refs #263] Refactoring repository. Add tests 2012-04-02 19:43:59 +04:00
Vladimir Sharshov fef3affc07 [Refs #263] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action 2012-04-01 19:19:54 +04:00
George Vinogradov 1e8021fe35 [issue #369] Added TOS page. 2012-03-31 17:18:22 +04:00
Pavel Chipiga 36b2eaa784 Fix root page search field design. Allow aninymous search only projects. Fix activity_feeds routes. Show anonymous project build lists. Remove unused specs. Refs #349 2012-03-31 03:43:55 +03:00
Pavel Chipiga 265090a172 Merge branch 'master' into 349-anonymous_access
Conflicts:
	db/schema.rb
2012-03-31 02:41:25 +03:00
Pavel Chipiga d6e6959f46 Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349, #263 2012-03-31 02:37:54 +03:00
George Vinogradov 0c09568d74 [issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
	app/models/group.rb
	app/models/user.rb
2012-03-31 02:48:44 +04:00
George Vinogradov 71c1a4afcf [issue #195] Owner removed from list of collaborators when editing list 2012-03-31 02:45:05 +04:00
Vladimir Sharshov 3cedef5f07 Merge branch 'master' into 344-fix_products_monitoring
Conflicts:
	db/schema.rb
2012-03-30 20:30:06 +04:00
konstantin.grabar d3c2bac226 [refs #344] Add product buils list filter and search 2012-03-30 15:26:28 +04:00
Vladimir Sharshov 34011513b5 [Refs #263] Remove old xml-rpc API 2012-03-29 23:19:00 +04:00
Vladimir Sharshov 39c5da2445 [Refs #263] Remove EasyUrpmi support 2012-03-29 23:07:38 +04:00
Vladimir Sharshov 0c2d0f4612 [Refs #263] Delete Categories 2012-03-29 23:01:25 +04:00
Vladimir Sharshov 5db485a4c0 [Refs #263] Remove Aut BuildList. Part 2 2012-03-29 22:43:46 +04:00
Vladimir Sharshov 66c285c796 [Refs #263] Delete AutoBuildList 2012-03-29 22:22:48 +04:00
Vladimir Sharshov 9a45353ccb Merge pull request #342 from warpc/128-account-activation
[Refs #128] account activation
2012-03-29 09:09:03 -07:00
konstantin.grabar 839daefc41 [refs #128] Small refactor of users#update action 2012-03-28 18:01:25 +04:00
Pavel Chipiga 9ee350b007 Refactor search controllers and scopes. Add search query whitespace strip. Refs #263 2012-03-28 02:58:03 +03:00
Pavel Chipiga c9f4cf0ea4 Fix and refactor project membered abilities. Refs #195 2012-03-28 00:28:50 +03:00
George Vinogradov baf35da99c [issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
	app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
Vladimir Sharshov 7143c7a9bc Merge pull request #343 from warpc/263-refactoring
[Refs #263] Fix comment tests; refactoring.
2012-03-27 10:13:04 -07:00
Pavel Chipiga b12f120962 Strip whitespaces during search. Refs #255 2012-03-27 19:22:45 +03:00
George Vinogradov 9bb1d80172 [issue #195] Added AJAX to /projects list. 2012-03-27 19:50:00 +04:00
Alexander Machehin a0b7f243d6 [refs #263] changed and fixed comment tests; some refactoring 2012-03-27 21:09:04 +06:00
konstantin.grabar f33ef75666 [refs #128] Add email confirmation on email change. Remove email confirmation after registration. 2012-03-27 17:45:09 +04:00
Pavel Chipiga dafedb3dcf Reroute and refactor admin user creation to force invitation and self registration work correct. Refs #270 2012-03-26 17:49:00 +03:00
Vladimir Sharshov 6a8b8fec3a [Refs #66] User builds more priority than mass rebuild with zero priority 2012-03-24 01:29:51 +04:00
Vladimir Sharshov 115c90f03b Merge pull request #331 from warpc/263-refactoring
[Refs #263] Fix broken tests
2012-03-23 13:49:20 -07:00
Pavel Chipiga d44de9f2bb Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195 2012-03-23 22:37:17 +02:00
Pavel Chipiga 861da824d0 Redirect to project build lists after build list creation. Add more columns for product build lists. Refs #223 2012-03-23 13:58:20 +02:00
Pavel Chipiga 4553affa56 Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190, #134 2012-03-22 19:11:12 +02:00
konstantin.grabar 16c9e6aa24 [refs #263] Fix most of the failed tests 2012-03-22 19:48:28 +04:00
Alexander Machehin 071c391a6e Merge branch '3.2-master' into 270-user_control
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
Alexander Machehin 23eeb1cae7 [refs #270] changes in ban 2012-03-22 20:50:15 +06:00
George Vinogradov 9f23cf7727 [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
konstantin.grabar 385bd8034b [refs #263] Fix projects#index 2012-03-22 17:30:01 +04:00
konstantin.grabar f354c53709 [refs #263] Merge 3.2-master into 263-refactoring 2012-03-22 17:28:09 +04:00
konstantin.grabar b7defd90f1 [refs #263] Remove unnessacesary projecsts#show action and test for it 2012-03-22 16:16:11 +04:00
Alexander Machehin fcc1fad0d1 [refs #270] fixed translations 2012-03-22 18:00:34 +06:00
Alexander Machehin 71f1822fce [refs #270] some refactoring 2012-03-22 17:17:11 +06:00
konstantin.grabar 5b1db0e041 [refs #263] Fix broken projects#show test and action 2012-03-22 14:13:56 +04:00
Alexander Machehin b0eeb4f260 [refs #270] fix some errors 2012-03-22 14:48:33 +06:00
George Vinogradov 9e31ae75b1 [issue #195] Added groups support to project. 2012-03-22 04:44:05 +04:00
Pavel Chipiga 90e027b8a6 Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190 2012-03-21 23:52:40 +02:00
Alexander Machehin 867d678dc4 [refs #270] some users tests 2012-03-22 02:05:27 +06:00
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
Vladimir Sharshov 87e1ee4700 Merge pull request #317 from warpc/232-groups_tests
[refs #232] Add groups tests and mass assignment protect
2012-03-21 12:06:00 -07:00
Alexander Machehin bf1340939b [refs #270] fixed users filtration 2012-03-22 00:02:58 +06:00
Alexander Machehin a6a5b722d2 [refs #270] use devise lockable to ban 2012-03-21 23:45:51 +06:00
konstantin.grabar 72c02282aa [refs #232] Add mass-assignment fixes. Add create and mass-assig tests. 2012-03-21 17:52:35 +04:00
Alexander Machehin 3c7dec3b97 Merge branch '3.2-master' into 270-user_control 2012-03-21 19:39:55 +06:00
Vladimir Sharshov 375aa7e74e Merge pull request #322 from warpc/265-activity_feed_messages
[refs #265] add ajax to older messages
2012-03-21 03:50:25 -07:00
Alexander Machehin b678320638 [refs #265] add ajax to older messages 2012-03-21 16:29:45 +06:00
Alexander Machehin 4a6ce6c8a8 Merge branch '3.2-master' into 270-user_control
Conflicts:
	app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
Alexander Machehin 5c408540ff [refs #270] can ban user 2012-03-21 02:06:51 +06:00
Alexander Machehin 20ff998f08 [refs #270] user control 2012-03-21 00:12:18 +06:00
Vladimir Sharshov 047425a27f Merge pull request #318 from warpc/279-new_design_for_platforms
[Refs #279] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
George Vinogradov 7c0585ee87 [issue #279] Added members and other changes. 2012-03-20 20:24:18 +04:00
Vladimir Sharshov 09fcc04489 Merge pull request #315 from warpc/200-new_build_repos_rules
[refs #200] Change build list repos and platforms interface
2012-03-20 06:02:49 -07:00
konstantin.grabar 981ea7d69f [refs #200] Remove debug code from build_lists controller 2012-03-20 17:01:18 +04:00
konstantin.grabar 31e0c9191c [refs #200] Fix build list form interface and include_repos logic 2012-03-20 14:36:31 +04:00
George Vinogradov d5d2b7229b [issue #279] Removed freeze & unfreeze actions from Platform 2012-03-19 19:03:09 +04:00
Alexander Machehin 86871ab32d Merge branch '3.2-master' into 265-activity_feed_messages
Conflicts:
	config/locales/menu.en.yml
	config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
Alexander Machehin dd5f51de71 [refs #265] added build tasks feed 2012-03-16 21:37:58 +06:00
George Vinogradov cc68163238 [issue #279] Fixed some bugs:
*  Redirect to repositroies page when remove repository.
  *  Fixed sorting background in Datatables styles.
  *  Fixed save button translation in platforms form.
  *  Fixed platform save & create flashes.
  *  Fixed cancel buttons in platform, product & repository forms.
  *  Redirect to created product on creation.
  *  Redirect to platform's products page after product destruction.
  *  Fixed permissions to Build button on product page.
  *  Fixed permissions to Add button on repository page.
  *  Fixed forbidden redirect when trying to acces
     RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
Alexander Machehin 4addff059b [refs #265] added activity feed tabs 2012-03-15 23:52:54 +06:00
George Vinogradov 548550d355 [issue #279] Added filtering to repositories projects. 2012-03-15 17:53:36 +04:00
George Vinogradov 747edb73a5 [issue #279] Merge branch '3.2-master' into 279-new_design_for_platforms
Conflicts:
	db/schema.rb
2012-03-14 21:43:08 +04:00
George Vinogradov 5a77b17a43 [issue #279] Almost finished design for platforms
TODO:
  *  Add design for crontab generator
  *  Fix path generation
2012-03-14 21:22:47 +04:00
Alexander Machehin 3642163fd7 [refs #265] changed feed messages 2012-03-14 23:00:26 +06:00
Alexander Machehin f6dd072a24 Merge branch '3.2-master' into 257-new_design_for_profiles
Conflicts:
	config/locales/users.en.yml
	config/locales/users.ru.yml
2012-03-12 23:04:31 +06:00
Alexander Machehin 24639b8684 [refs 257] renamed to profile 2012-03-12 21:03:25 +06:00
Alexander Machehin 5f6ca140d9 [refs #257] add ability to destroy avatar 2012-03-12 18:51:07 +06:00
Vladimir Sharshov 64926498d6 [Refs #195] Fix pagination for index projects page 2012-03-12 16:05:19 +04:00
George Vinogradov c2dc8d9e38 [issue #279] Added platform products list 2012-03-12 04:07:18 +04:00
George Vinogradov 61bd704cb1 [issue #279] Added platform repositories list. 2012-03-12 03:58:25 +04:00
George Vinogradov 535c075d3e [issue #279] Added platform main page, menu & sidebar 2012-03-12 03:08:50 +04:00
Pavel Chipiga 3e344f90ad Display only 10 last activities. Refs #265 2012-03-12 00:47:22 +02:00
George Vinogradov 19a962560a [issue #279] Merge branch '3.2-master' into 279-new_design_for_platforms
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-03-12 01:38:20 +04:00
Alexander Machehin c4fd73b52b [refs #265] fixed double wiki feed 2012-03-12 00:28:14 +06:00
Alexander Machehin 6d5120e5cc Merge branch '3.2-master' into 265-new_design_for_activity_feed 2012-03-11 22:44:25 +06:00
Alexander Machehin 66b57f7a0a [refs #265] fixed issue assignee 2012-03-11 17:56:56 +06:00
Pavel Chipiga 1cf2660cda Fix search order. Refs #255 2012-03-08 02:32:12 +02:00
Pavel Chipiga 41cd1ddaf3 Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195 2012-03-07 23:34:49 +02:00
Vladimir Sharshov e49551756c Merge pull request #276 from warpc/194-issue_page
[Refs #194] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
George Vinogradov 9c78a917a1 [issue #279] Added platforms page. 2012-03-07 22:59:37 +04:00
Alexander Machehin de62aaad53 [refs #257] fix user update registration page 2012-03-08 00:47:19 +06:00
Alexander Machehin 185962890f [refs #194] issue executor 2012-03-07 22:27:12 +06:00
Alexander Machehin c657efc338 [refs #194] show all project labels without searching 2012-03-07 19:36:17 +06:00
Alexander Machehin 7588a318da Merge branch '3.2-master' into 265-new_design_for_activity_feed
Conflicts:
	app/models/user.rb
2012-03-07 03:58:35 +06:00
Alexander Machehin 13ba125dc0 [refs #265] add project_id to comment & fix email notification 2012-03-07 03:49:29 +06:00