8c67c5151f
#822 : remove 'default' priority for IsoWorker
2012-12-28 18:09:16 +04:00
50bdb12e40
#822 : add queue with priority
2012-12-28 18:00:37 +04:00
6fc5eaa65c
[refs #818 ] add system role
2012-12-28 00:27:50 +06:00
dbb3253a73
update BuildList#publish_container
2012-12-27 19:24:03 +04:00
ba09d2afcf
Merge pull request #816 from warpc/814-add-validation-that-save_to_repository-contains-project
...
[refs #814 ]: add validation for checking that "save to repository" contain project.
2012-12-26 10:26:44 -08:00
7cb53a2930
Merge pull request #798 from warpc/796-change_api_defender
...
[refs #796 ] add api limit for user
2012-12-26 08:53:06 -08:00
1d2956419e
#814 : add validation for checking that repository contains project, update specs
2012-12-26 17:06:17 +04:00
b31cc17f5c
set bs_id after creating task for resque
2012-12-25 23:52:52 +04:00
ce457a3c64
hot fix
2012-12-25 21:36:34 +04:00
5c05ab26d8
update "project_version" for mass_build, disable "sleep" for new_core
2012-12-25 21:06:57 +04:00
ca24de30b9
fix for creating mass_build
2012-12-25 20:01:44 +04:00
5d483b0c1d
[refs #796 ] add email access && small refactoring
2012-12-25 21:55:56 +06:00
f0b9d23bc2
Merge branch 'master' into 794-move-all-keys-into-abf-bd
2012-12-25 18:24:01 +04:00
67a4dbc243
#807 : small refactoring
2012-12-25 17:59:31 +04:00
c4f260c7f5
#807 : update type for personal platforms
2012-12-25 17:49:12 +04:00
7d58b89366
add a new core option to mass_builds
2012-12-25 18:15:20 +06:00
3d707f7850
hot fix for Platform#urpmi_list method
2012-12-25 14:44:40 +04:00
71672826b2
again fix ActiveRecord::UnknownAttributeError: unknown attribute: build_requires
2012-12-25 09:09:26 +06:00
bc35bc5757
#794 : change folder for tmpdir
2012-12-24 19:54:37 +04:00
bce1b63d20
#794 : merge master into the branch
2012-12-24 19:02:55 +04:00
19372b403b
#784 : remove "build_requires" as param for abf-worker
2012-12-24 18:12:57 +04:00
ea14f541fe
#784 : merge master into the branch
2012-12-24 18:11:27 +04:00
9b8a55db42
#794 : merge master into the branch
2012-12-24 18:07:09 +04:00
577b71a62e
#794 : rename errors: "contains_<secret|public>_key" to "wrong_<secret|public>_key"
2012-12-24 17:58:46 +04:00
f472b862ae
#794 : set "LC_ALL" on checking passphrase
2012-12-24 17:54:14 +04:00
f25a988730
#784 : remove "build_requires" from BuildList
2012-12-24 17:17:21 +04:00
ac762388a4
#800 : enable "new_core" for personal platforms
2012-12-24 16:35:29 +04:00
597fb03374
#794 : small fix, update specs
2012-12-24 14:53:20 +04:00
48cd266aee
#794 : small refactoring
2012-12-24 14:20:09 +04:00
9d59e522db
#794 : add resign packages resque task
2012-12-21 22:59:07 +04:00
7f14958a89
#794 : send repository_id to resque job
2012-12-21 16:23:46 +04:00
da4860bc45
#794 : add #key_pair action, add new specs
2012-12-20 23:46:16 +04:00
c72968ba2a
#794 : add validation for length of key
2012-12-20 21:36:32 +04:00
a09699fc03
#794 : merge master into branch
2012-12-20 19:33:14 +04:00
00de736c5e
#794 : add checking for passphrase
2012-12-20 19:00:30 +04:00
7f2bf385fd
Merge pull request #781 from warpc/777-group_owner
...
[refs #777 ] Big test fix, refactoring tests.
2012-12-20 06:03:38 -08:00
334b078855
#794 : update KeyPair model, write migration
2012-12-19 22:18:00 +04:00
06f629fdd6
#778 : revers tome changes
2012-12-18 21:29:21 +04:00
d19f96abce
#778 : send packages for cleanup on publishing
2012-12-18 17:18:54 +04:00
e658f8765e
add user auth only to hidden projects
2012-12-18 17:18:32 +06:00
3dc1cb8124
Merge branch 'master' into 778-file-system-workers
2012-12-18 14:34:12 +04:00
d155242f33
#778 : pass "released" status of platform to resque job
2012-12-17 21:17:18 +04:00
e3314a724f
#778 : pass "save_results" option to resque job
2012-12-17 20:13:24 +04:00
b9ef0f7c5d
Merge branch 'master' into 777-group_owner
2012-12-17 21:17:50 +06:00
f90bd06fb3
#778 : separate "binary" and "source" packages
2012-12-17 19:14:52 +04:00
514dcbe994
#778 : some refactoring and fixes
2012-12-17 19:03:52 +04:00
eaa26db89a
#778 : remove unnecessary code
2012-12-17 18:50:09 +04:00
c159146048
#778 : add #destroy_project_from_repository method
2012-12-17 18:39:02 +04:00
12b8b4c612
[refs #782 ] fix error with base auth
2012-12-17 20:18:18 +06:00
f9d680857d
[refs #782 ] fix undefined method access_locked? for nil:NilClass
2012-12-17 19:12:12 +06:00
8757724acc
#778 : update rails gem, update destroy Platform and Reposytory
2012-12-17 16:28:17 +04:00
1bae7d2293
Merge branch 'master' into 778-file-system-workers
2012-12-17 13:29:49 +04:00
333bbf7cf6
[refs #787 ] fixed inline commit comments
2012-12-15 11:17:11 +06:00
fc4bd690a8
Merge pull request #783 from warpc/782-url_to_closed_project
...
[refs #782 ] support user hash token auth in git; add base auth to git url sending to build system
2012-12-14 10:09:47 -08:00
9bc560e8aa
#778 : misprint
2012-12-14 21:36:35 +04:00
de7665c8ca
#778 : revert some changes after merge 753-remove-xml-rpc
2012-12-14 21:33:43 +04:00
8e63d78f77
#778 : merge master and 753-remove-xml-rpc into branch
2012-12-14 21:19:23 +04:00
01389ba90d
[refs #785 ] add authorization to archive path
2012-12-14 21:41:22 +06:00
6f623dbab5
#785 : udd user to ProductBuildList, and etc changes
2012-12-14 19:14:33 +04:00
2f1a21cbdf
[refs #782 ] restore login&pass authentication
2012-12-14 19:20:46 +06:00
2bb5d517a2
[refs #782 ] add base auth to git url
2012-12-14 17:25:10 +06:00
7528b05715
#778 : some refactoring, fix specs
2012-12-13 23:14:18 +04:00
519886fecd
[refs #777 ] fix for group owned project
2012-12-14 00:18:22 +06:00
07d0ed89b4
#778 : integrate FileSystemWorker with Platforms and Repositories
2012-12-13 21:38:04 +04:00
1509910a1f
#778 : add file_system_worker for repositories and platforms
2012-12-13 20:13:13 +04:00
4e1aa466fd
#755 : small refactoring
2012-12-13 16:30:37 +04:00
1bebdb34db
#755 : add personal repository for creating BuildList
2012-12-13 16:24:29 +04:00
cdcce3ad43
#755 : update path to all repositories
2012-12-12 18:06:46 +04:00
71717311d1
Merge branch 'master' into 755-publish-build-list-container
2012-12-12 16:47:25 +04:00
e245c4e86f
#755 : update time_live of worker
2012-12-12 16:34:33 +04:00
59c1d75a36
Merge pull request #772 from warpc/762-ui_and_refactoring
...
[refs #762 ] ui and refactoring for mass build; fix syntax highlight
2012-12-11 14:19:56 -08:00
3b8524bd28
#755 : small fix
2012-12-11 18:47:57 +04:00
60ce85269e
[refs #762 ] optimize build_for method
2012-12-11 20:35:36 +06:00
a452df79b8
[refs #762 ] refactoring
2012-12-11 19:48:16 +06:00
1c51a2d514
#755 : update path to platform for personal platforms, some refactoring
2012-12-11 15:47:32 +04:00
60986b7a18
[refs #762 ] refactoring
2012-12-11 01:35:56 +06:00
b62414ec1d
#755 : update BuildList#publish_container
2012-12-10 22:04:33 +04:00
0fe74f17ac
#755 : merge master into the branch
2012-12-10 21:05:25 +04:00
62a761a7c9
#766 : add filter to /build_lists page
2012-12-10 16:15:22 +04:00
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
6a99d56489
#759 : add comments, some refactoring according to Vladimir's comments
2012-12-07 15:47:42 +04:00
a8e1cea057
#759 : save sec of time_living instead of minut, some fixes of state_machine
2012-12-07 15:11:12 +04:00
f8cbae424e
#759 : update #build_canceled event
2012-12-07 13:10:38 +04:00
31461eeadf
[refs #762 ] Fix searching platform package, fix repository selecting.
2012-12-07 02:28:51 +04:00
632a007e2d
Add missing params for build_from_list operations
2012-12-07 01:21:05 +04:00
b91489c886
[refs #762 ] fix many errors
2012-12-07 02:12:48 +06:00
4d3fe773cd
#759 : update time_living for tasks
2012-12-06 23:57:20 +04:00
8eabfc975a
#759 : add comment
2012-12-06 23:45:35 +04:00
eae2b2ce02
#759 : add state_machine into the ProductBuildList
2012-12-06 23:18:28 +04:00
e3e228de33
#759 : add tester role for user
2012-12-06 22:04:39 +04:00
dc1525b85e
[refs #762 ] add mass build from list
2012-12-06 23:59:17 +06:00
ab8c4016b5
#759 : refactoring according to Vladimir's comments
2012-12-06 21:34:09 +04:00
c3e8d18925
#759 : remove #xml_rpc_create method
2012-12-06 21:10:23 +04:00
ef8ece3e87
#759 : update status for BuildList::Item, fix getting logs
2012-12-06 20:28:44 +04:00
60f2ab3d96
#759 : some fixes
2012-12-06 20:00:24 +04:00
ff2ae73985
#759 : add action for cancel build, some refactoring
2012-12-06 18:41:24 +04:00
97196c5484
[refs #758 ] fix error on fork
2012-12-06 18:35:05 +06:00
1f74b25522
#755 : add workers for publishing build_lists
2012-12-06 14:11:51 +04:00
18e53bd5b8
[refs #753 ] change git-repo HEAD
2012-12-06 13:26:31 +06:00
bdc2cd78fb
[refs #758 ] add default branch validation
2012-12-06 13:18:16 +06:00
9e5a7e3fdb
[refs #674 ] fix get last published commit
2012-12-04 15:59:16 +06:00
b132a56937
Merge branch 'master' into 674-diff_between_commits
...
Conflicts:
db/schema.rb fresh
2012-12-04 00:02:45 +06:00
ec6279d803
[refs #674 ] add diff to build lists
2012-12-03 23:43:24 +06:00
d325838b1f
Merge branch 'master' into 735-package-build-server
2012-12-03 15:38:03 +04:00
bfa538e644
[refs #732 ] small refactoring
2012-11-30 23:15:37 +06:00
46d465536f
some refactoring, add comments
2012-11-30 17:10:17 +04:00
ace1312095
hot fix
2012-11-30 15:34:08 +04:00
1af7b7525f
remove some comments
2012-11-30 15:19:55 +04:00
fcdbfd4538
add new column to build_lists table, some refactoring
2012-11-30 14:41:39 +04:00
b468f0655f
some refactoring of #log method
2012-11-29 23:42:54 +04:00
a5daff3442
update getting logs, some repo generation
2012-11-29 21:56:03 +04:00
791f77dfd5
add 'New core' option for creating build_list
2012-11-29 19:12:24 +04:00
5899d5f28f
add filters to maintainers list api
2012-11-29 09:32:10 +04:00
0545863642
refactor
2012-11-28 10:04:40 +04:00
3d6269da9b
add results column to build_lists table
2012-11-27 18:22:17 +04:00
c7adea14ce
fix the tasks duplication
2012-11-27 14:59:47 +04:00
96e8df1b50
use Redis for getting log
2012-11-26 22:16:34 +04:00
c7ea2f7656
send task to abf-worker
2012-11-26 22:00:29 +04:00
af2be3fb09
create logical model for serach by ABF
2012-11-21 19:04:41 +04:00
6fe07d83d6
add validation for build_for_platform field
2012-11-20 20:14:51 +04:00
7be2df7578
[refs #674 ] first step of the diff between commits
2012-11-20 01:15:15 +06:00
b7b0ea2f7a
remove #check_status method
2012-11-19 22:08:02 +04:00
2f0f49d674
hot fix
2012-11-19 20:39:57 +04:00
894f8651d9
rename BUILD_IN_QUEUE to BUILD_PENDING
2012-11-19 20:38:08 +04:00
223cf774f6
revert path to data
2012-11-19 19:48:14 +04:00
846aedf49d
add canceling status
2012-11-19 19:41:59 +04:00
75596c3e2d
revert path to data
2012-11-19 19:19:05 +04:00
ebbf47f818
show file size, and in_queue status for ProductBuildList
2012-11-19 19:11:07 +04:00
41ce06b36e
Merge pull request #722 from warpc/90-error_on_create
...
[refs #90 ] Fix error on pull create, create special place for temporary pull request, add cron task for clear temporary pull request, add cron task for clearing activity feed, fix build list pagination error
2012-11-14 10:31:53 -08:00
50ce84bfa9
remove old activity feeds
2012-11-15 00:10:03 +06:00
56e9174045
[refs #90 ] avoid collisions with temporary repos
2012-11-14 22:28:21 +06:00
1afcef17c3
[refs #90 ] clean dir before clone
2012-11-14 21:46:59 +06:00
8ad53f4c0b
[refs #90 ] create a "new" pull at another dir
2012-11-14 16:52:26 +06:00
f522fd3cd0
add selecting Arch on create product build
2012-11-13 18:01:06 +04:00
abbbacdf7f
update ability.rb, add new specs
2012-11-13 15:11:33 +04:00
57ec1e2982
update specs for Products and ProductBuildLists
2012-11-13 14:31:45 +04:00
cb488a35d1
refactoring of model, update factory
2012-11-13 13:27:39 +04:00
21d8a42072
merge master into the branch
2012-11-12 20:52:33 +04:00
577b8d6af8
Add comment for ProductBuildList#stop
2012-11-12 20:05:34 +04:00
259eeaecfc
add Stop action and time_living for building ISO
2012-11-12 17:22:19 +04:00
d2871afaff
revert changes
2012-11-12 13:41:41 +04:00
8f9cd0ff8a
updated logger on build product page
2012-11-09 21:42:25 +04:00
26af1aa27c
Merge branch 'master' into 90-fix_orphan_pulls
...
Conflicts:
app/models/pull_request.rb
2012-11-09 20:53:55 +06:00
b39ccea0d5
add show logs in real time
2012-11-09 17:08:56 +04:00
3d293b908d
added IsoWorkerObserver
2012-11-09 01:39:42 +04:00
4595ce349c
Merge branch 'master' into iso-worker
2012-11-08 18:17:35 +04:00
34f1026728
add fake url for project
2012-11-08 17:04:02 +04:00
08b3099b90
Send http(s) git url instead NFS path
2012-11-08 13:41:07 +04:00
e9233d362a
add new git_path param
2012-11-08 15:13:48 +06:00
9d7de35ec4
start ISO worker
2012-11-07 18:32:46 +04:00
eb40fbbbd5
removed unnecessary fields for build ISO
2012-11-07 16:14:31 +04:00
e9ac67de5f
Fix validations for groups, platforms, projects, repositories,
...
users
2012-11-07 16:25:43 +06:00
36ac66303a
fixed user uname validation
2012-11-07 15:30:34 +06:00
6a7035d551
added #show action for product_build_list
2012-11-06 22:01:54 +04:00
e39ca302d7
#new action for build ISO - done.
2012-11-06 21:17:44 +04:00
b1722cae75
added some params for build ISO
2012-11-06 20:19:52 +04:00
ecec330b4d
added migration, updated models, UI
2012-11-06 18:13:16 +04:00
970da230f2
[refs #90 ] add validations
2012-10-29 21:33:20 +06:00
36e07b440f
[refs #90 ] set data to pull
2012-10-28 00:46:04 +06:00
c6a0dfee97
[refs #90 ] fixed orphan pulls
2012-10-28 00:04:28 +06:00
95e5804358
[refs #90 ] fixed git timeout error on the big diff
2012-10-26 20:03:46 +06:00
e9fd2a2df6
Merge branch 'master' into 706-get-list-of-projects-by-repository
2012-10-19 18:51:11 +04:00
ba968cc5a0
#706 : updated Ability model, Repositories controller, added specs
2012-10-19 18:49:01 +04:00
00e92d9672
Merge pull request #678 from warpc/579-code_line_comments
...
[refs #579 ] code line comments
2012-10-19 07:48:50 -07:00
18ac16ae96
#698 : small refactoring, added ckeck for main platform
2012-10-19 18:03:09 +04:00
6c8c1ca880
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-10-19 18:47:26 +06:00
54f462f408
[refs #579 ] small refactoring
2012-10-19 15:50:15 +06:00
0cf0933074
#698:small refactoring
2012-10-19 11:32:12 +04:00
ea1ec80d29
[refs #579 ] fixed bug with updating comments
2012-10-18 23:37:52 +06:00
d5ad5b1a95
Merge branch 'master' into 698-rest-api-for-advisories
2012-10-18 18:59:00 +04:00
334fc9a574
#698 : revert advisory model
2012-10-18 18:29:31 +04:00
68dbae8c83
#698 : added #create and #fork actions for Advisories API
2012-10-18 18:17:50 +04:00
e15bf13c4f
[refs #90 ] small refactoring of the diff method
2012-10-18 18:09:12 +06:00
62ca030110
[refs #90 ] head_branch -> from_branch
2012-10-18 17:46:57 +06:00
7870ffef7d
[refs #579 ] fixed some bugs
2012-10-18 00:38:42 +06:00
97590f06a0
#686 : added specs for projects API
2012-10-17 21:08:21 +04:00
6680265c64
#686 : some refactoring of relations
2012-10-17 17:46:16 +04:00
2d067a45ca
#686 : added members action for project API
2012-10-17 16:18:52 +04:00
e5af275c3a
#692 : small refactoring according to Alexander's comments
2012-10-16 20:36:59 +04:00
c36ae5413b
#692 : added specs for Group API
2012-10-16 18:44:21 +04:00
432e219571
#692 : some refactoring
2012-10-16 17:42:52 +04:00
3868fbf4f3
[refs #579 ] forgot change to the pull.repo
2012-10-16 19:22:19 +06:00
b2fd348351
[refs #579 ] fixed bug with saving around lines
2012-10-16 19:21:47 +06:00
df105efd56
#692 : added #update_member action for Groups API
2012-10-16 17:03:18 +04:00
9579734506
[refs #579 ] some optimization by getting pull repo
2012-10-16 16:19:53 +06:00
b0604f89d1
[refs #579 ] move logick to model
2012-10-16 15:50:21 +06:00
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
8d4311e419
[refs #579 ] remove a wrong line
2012-10-15 23:46:44 +06:00
66f0cc3244
[refs #579 ] fixed setting status to inline comments
2012-10-15 23:45:01 +06:00
e3a0005bd3
[refs #579 ] small refactoring
2012-10-15 23:42:28 +06:00
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
fae5d3ff2b
#690 : truncate project name before validation
2012-10-15 12:28:18 +04:00
00f5d0ce62
#672 : updated Repositories API
2012-10-14 17:38:06 +04:00
c5d6707b8f
[refs #579 ] fixed commit comments errors
2012-10-13 01:57:54 +06:00
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
993454fc29
[refs #579 ] alpha version of the pull discussion
2012-10-11 23:50:40 +06:00
7f031ac688
[refs #374 ] added commit validation
2012-10-11 22:11:53 +06:00
eef640e82c
#671 : added API Platforms#create action, updated specs, added validation to platform model
2012-10-10 21:45:56 +04:00
abe31b3c2e
#671 : added API #update action for platform
2012-10-09 18:46:20 +04:00
07bf8f1d0f
fixed missprint
2012-10-09 17:54:17 +04:00
1e2d41b183
updated Ability model
2012-10-09 17:50:09 +04:00
d83243a3a3
hot fix for API
2012-10-09 17:47:05 +04:00
ed7aec602f
[refs #579 ] alpha version of the pull inline comments
2012-10-06 01:19:05 +06:00
3513d47be6
[refs #90 ] fix updating pull
2012-10-05 23:32:29 +06:00
80a91b21a9
[refs #579 ] fixed bug with new_line access
2012-10-05 18:32:56 +06:00
2360a25a42
[refs #579 ] fixed many errors
2012-10-05 17:02:25 +06:00
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
21a5115137
[refs #579 ] fixed destroing comments
2012-10-05 12:13:14 +06:00
527dd210bf
[refs #579 ] alpha version of inline comments for commit
2012-10-05 00:40:12 +06:00
f5d0d9f20b
#671 : added filter platforms by type
2012-10-04 17:34:30 +04:00
04b2647ef0
#668 : added uploading avatars for groups
2012-10-03 20:38:42 +04:00
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
d2c338e4e4
Merge pull request #665 from warpc/90-ui
...
[refs #90 ] pull request ui + fixes
2012-10-02 10:41:06 -07:00
ecae06db81
#349 : removed duplicate of ability
2012-10-02 21:16:55 +04:00
cb994c6fd6
#349 : created autocompletes_controller, refactoring, updated specs
2012-10-02 20:54:55 +04:00
f699add7b4
[refs #90 ] clean ability
2012-10-02 22:46:51 +06:00
53b421d8e5
[refs #90 ] fixed pull ability for project writers & changing tests
2012-10-02 21:19:50 +06:00
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
d36155ec7f
[refs #90 ] remove useless abilities
2012-10-02 19:24:53 +06:00
8f011316c3
[refs #90 ] possible fix for nil commom ancestor commit
2012-10-01 23:52:18 +06:00
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
8cb9171c17
[refs #90 ] final fix to merge
2012-09-28 20:31:21 +06:00
0069dfffc7
[refs #90 ] catch error
2012-09-28 18:26:12 +06:00
abafbc6ef5
Merge again-and-again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-09-28 00:09:34 +06:00
f579fc007a
[refs #90 ] fixed ability for pulls
2012-09-28 00:00:04 +06:00
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
77b57cce11
[refs #374 ] Fix support http basic auth, fix tests, fix abilities.
2012-09-26 21:15:11 +04:00
cc05fa695a
[refs #90 ] fixed pull abilities part 2
2012-09-26 23:09:29 +06:00
5f0e683711
#90 : moved code
2012-09-26 19:41:00 +04:00
37c9a906c4
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
2012-09-26 18:45:26 +04:00
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
efe8b1ffdb
#90 : small refactoring
2012-09-26 18:20:46 +04:00
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
3491492c8d
[refs #90 ] fixed pull authorization
2012-09-26 15:24:46 +06:00
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
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
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
a29a2f8fe9
[refs #616 ] change ability for preview
2012-09-25 15:46:19 +06:00
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
11c428ec20
[refs #374 ] Fix failed tests after http basic auth
2012-09-21 23:48:30 +04:00
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
7a8b68b90b
small refactoring
2012-09-20 00:54:15 +04:00
17bdcf9a3c
updated model according to last comments, added new specs
2012-09-19 23:52:18 +04:00
426eb72d5f
moved #notify_users method from observer to model, updated specs
2012-09-19 17:55:17 +04:00
7ea856686e
#575 : added some specs
2012-09-18 01:11:28 +04:00
5dd352887d
#575 : removed unnecessary method
2012-09-17 21:17:22 +04:00
6b62615a3e
#575 : did some refactoring according to comments
2012-09-17 20:17:43 +04:00
8788db12c0
#575 : added notification for users
2012-09-17 19:18:02 +04:00
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
2681a1c676
#575 : added logic for BuildList notification
2012-09-16 22:18:41 +04:00
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
1c9a9e803e
#638 : some refactoring
2012-09-13 00:47:39 +04:00
1a75a5a394
#638 : updated Relation model, repositories and platforms controllers according to comments
2012-09-12 23:32:51 +04:00
8d35786183
#641 : added is_package checkbox to #new page, updated model
2012-09-12 19:06:34 +04:00
b468b09529
#638 : some refactoring for adding new user
2012-09-12 17:07:34 +04:00
aadfb39682
#638 : added access to add/remove member to repository for owner and local_admin
2012-09-12 16:17:51 +04:00
1f32e72508
#638 : added access to remove_project for members of repository
2012-09-12 00:43:08 +04:00
96466b808b
#638 : fixed ability model
2012-09-12 00:40:16 +04:00
b4c2c368e4
#638 : added permissions to add new project for members of repository
2012-09-12 00:27:28 +04:00
1e40b9fb06
#638 : some refactoring
2012-09-12 00:08:25 +04:00
3858bfa6b7
#638 : added members to repository model, updated views
2012-09-11 19:30:14 +04:00
bff32c27c4
#637 : removed comments
2012-09-11 12:36:33 +04:00
1768df5010
#637 : removed unnecessary lines
2012-09-10 15:19:13 +04:00
5f941844f2
#637 : added migration, updated approve_notification
2012-09-10 15:08:53 +04:00
8c06b0c18d
[refs #631 ] Fix right for publication build list using publish button
2012-09-07 22:45:03 +04:00
7570f1cab7
Set publish_without_qa to false for all platform repos when released. Fix mgration. Refs #631
2012-09-07 18:41:42 +03:00
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
29f5ef5f2e
Refactoring tests
2012-09-07 13:41:49 +04:00
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
71e28cf3f3
Merge branch 'master' into 349-anonymous_access
2012-09-07 00:31:28 +04:00
9247a1c850
Merge pull request #613 from warpc/263-refactoring
...
[#263 ] Исправление и рефакторинг тестов
2012-09-06 13:23:23 -07:00
2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
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
c1d87a36da
#631 : fixed misprint in model and controller
2012-09-06 19:43:07 +04:00
f0f11cb9dc
#631 : added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
2012-09-06 17:43:50 +04:00
698e55e3e8
[refs #263 ] Test refactoring
2012-09-06 14:53:03 +04:00
a2d87c9228
Fix autocomplete_maintainers for local admins. Refs #620
2012-09-06 13:31:31 +03:00
b9a622acec
[refs #374 ] Add unixtime search and output. Fix rate limit configuration and 404 status
2012-09-05 17:47:25 +04:00
ff8f9da14f
[refs #374 ] Refactor api build list create method
2012-09-04 16:44:28 +04:00
3e69d7d0f4
[issue #349 ] Guest user can show open platforms.
2012-09-01 02:00:39 +04:00
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
decd4bf293
[issue #620 ] Removed scope from BuildList::Package && small refactoring.
2012-08-31 21:47:52 +04:00
16e101cc05
[issue #620 ] Fixed BuildList#actualize_packages
2012-08-31 01:20:30 +04:00
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
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
88d0e358ce
[issue #620 ] Set maintainer for new and forked project
2012-08-28 19:00:04 +04:00
6c4b13f0da
[issue #620 ] Removed project_maintainer & assignee
2012-08-28 18:25:57 +04:00
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
7572562cad
[issue #620 ] Changed packages actualization.
2012-08-25 00:27:10 +04:00
d24a149d9a
[issue #620 ] Added search of maintainer by package
2012-08-24 20:06:59 +04:00
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
a4b03b53ce
Refactor maintainer-db spec and model
2012-08-22 00:02:33 +04:00
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
a70f9b9ecb
[refs #616 ] allow create issue for public projects
2012-08-20 23:54:55 +06:00
656892afe3
Merge pull request #612 from warpc/590-build_list_page_change
...
[refs #590 ] Add auto updatable log block in build list page. Added forecast assembly time in monitoring page.
2012-08-17 15:30:48 -07:00
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
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
f2565c4877
[refs #90 ] remove Baden-Baden
2012-08-15 19:50:26 +06:00
cada20ed63
Merge branch 'master' into 590-build_list_page_change
2012-08-14 15:46:16 +04:00
b2ff7326d1
Merge branch 'master' into 90-pull
...
Conflicts:
config/locales/en.yml
config/locales/ru.yml
2012-08-13 15:01:43 +06:00
efa08933fd
[issue #590 ] Added average build time to :build_started BuildLists
2012-08-12 02:08:28 +04:00
ab939253df
[refs #90 ] optimization?
2012-08-10 23:06:34 +06:00
11e5f4dd99
[refs #90 ] try use grit to clone
2012-08-10 22:42:34 +06:00
c1c9f9680e
[refs #90 ] remove code duplication
2012-08-10 22:40:09 +06:00
5759a53fae
Temporarily transfer path for the git repository via NFS
2012-08-10 18:50:30 +04:00
1d5470b7d6
[refs #90 ] small fixes
2012-08-09 23:56:55 +06:00
d8da0d8c60
Inform the kernel about project git address(part 3): add protocol
2012-08-09 20:46:09 +04:00
f4b3c53362
Inform the kernel about project git address
2012-08-09 17:56:45 +04:00
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
4c02d4be19
[refs #90 ] fixed error
2012-08-08 16:33:48 +06:00
0ddb960b8b
[refs #90 ] remove commits from pull refs
2012-08-08 00:23:17 +06:00
edf882f2a1
[refs #90 ] remove unneeded method
2012-08-08 00:17:10 +06:00
5cb1f4e7e9
[refs #90 ] small delegate refactoring
2012-08-08 00:08:02 +06:00
a7f926bbdf
[refs #90 ] forgot dependent destroy
2012-08-08 00:07:26 +06:00
6225410720
[refs #90 ] enable check for uniq pull requests
2012-08-08 00:06:49 +06:00
37a0b4efe8
[refs #90 ] fixed error with / in branch name
2012-08-07 23:40:40 +06:00
b50d9f87d2
[refs #90 ] clean ability
2012-08-07 23:07:18 +06:00
2a6b08c269
[refs #90 ] fixed error with wrong treeish
2012-08-07 22:24:47 +06:00
35642102dd
[refs #90 ] fixed show merge button
2012-08-07 19:25:08 +06:00
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
30efe134ef
[refs #604 ] Remove old and empty mass builds
2012-08-07 01:07:54 +04:00
f35d4cd873
Merge branch 'master' into #604-Remove_old_buildlist_created_more_than_3_month_ago
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-08-07 00:53:43 +04:00
69fb368911
merger stash
2012-08-07 00:48:29 +04:00
38aa39743a
[refs #590 ] Fix mass build(part 2)
2012-08-07 00:22:16 +04:00
ea16c47105
[refs #590 ] Fix mass build
2012-08-07 00:04:52 +04:00
be6179b2ad
[refs #90 ] clean comment
2012-08-07 00:24:31 +06:00
02214dda09
[refs #90 ] fixed merge with master
2012-08-07 00:17:04 +06:00
c268930a45
[refs #90 ] small refactoring
2012-08-07 00:13:07 +06:00
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
09a5180c22
[refs #90 ] remove Baden-Baden
2012-08-06 23:53:55 +06:00
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
08c58a84df
[refs #604 ] Remove old build list after 3 month
2012-08-06 19:35:11 +04:00
43d8e2020c
[refs #374 ] Remove states check logic from ability.rb. Small api reject answer fix
2012-08-06 16:21:19 +04:00
c7a3addfb8
[refs #601 ] Add statuscheck for destroy action in product build list
2012-08-06 16:06:42 +04:00
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
36da0cf808
[refs #374 ] Continue tests fix
2012-08-06 14:43:04 +04:00
36de270fad
[issue #590 ] Moved repository check to controller.
2012-08-06 14:21:33 +04:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
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
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
6c4a574f49
[refs #441 ] self.key_id and stub result fix
2012-07-31 17:05:25 +04:00
931d4a7db0
[refs #441 ] Key Pairs fixes and refactoring
2012-07-31 16:50:53 +04:00
43309d86e6
Merge branch 'master' into 441-key_pairs, fix schema, add migration
...
Conflicts:
db/schema.rb
2012-07-31 02:02:15 +04:00
73a369ba49
[refs #441 ] Refactring: part 2. Fix integration with kernel, change view for keys list
2012-07-31 01:24:31 +04:00
ef25bb502a
[issue #565 ] refactoring, proposed by @alexander-machehin
2012-07-31 00:42:32 +04:00
d7e9cefd0b
[issue #590 ] Added validation on repository.
2012-07-30 23:26:51 +04:00
89d67f9ea6
[refs #441 ] Refactring, fix errors
2012-07-30 23:08:14 +04:00
724b36a4b4
Merge master into 570-mass_builds_status_counters_bug
2012-07-30 18:53:18 +04:00
dd13b38da3
[refs #570 ] Add status variable
2012-07-30 18:49:40 +04:00
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
33e6cdc285
[refs #570 ] Remove mass build counters logs and transactions
2012-07-27 19:17:07 +04:00
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06:00
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
548fb99ebe
[refs #570 ] Try to do counters change into transaction with locking
2012-07-27 16:28:08 +04:00
fb60dac748
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-07-27 00:19:36 +03:00
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
f9b217379d
[refs #570 ] Add mass build counters logs
2012-07-26 15:45:23 +04:00
91dddd5dac
Merge branch 'master' into 570-mass_builds_status_counters_bug
2012-07-26 15:06:09 +04:00
606609dea6
Merge pull request #580 from warpc/576-flash_notifies
...
[refs #576 ] Add flash notifies
2012-07-25 12:18:44 -07:00
03509e714c
Merge branch 'master' into 263-refactoring
2012-07-25 21:42:48 +03:00
c0036a1bb5
[refs #576 ] Fix should_show? method and template offsets
2012-07-25 16:41:12 +04:00
a0a4c8b100
[refs #581 ] dont destroy child projects
2012-07-24 22:02:02 +06:00
3d19a4f23e
[refs #576 ] Optimize tests, views and model
2012-07-24 13:19:22 +04:00
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
ee15ca26ca
[issue #565 ] Refactoring. Fixed html mail template.
2012-07-20 23:59:32 +04:00
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
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
d130409640
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
7061696100
[refs #570 ] Replace :all to :everything for builds filter
2012-07-18 17:49:21 +04:00
6430678c00
[refs #570 ] Add :all option for build lists visibility
2012-07-18 16:00:40 +04:00
778b76e5ff
[refs #570 ] Fix mass builds counters update. Fix mass build and failed_build_list links
2012-07-18 14:31:49 +04:00
3a183e0dc3
[refs #441 ] Remove unused files. Add mass assigment specs
2012-07-17 13:31:32 +04:00
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
70b2d62e52
[refs #441 ] Some small fixes of locales and code
2012-07-16 13:58:33 +04:00
3cf3546c2e
[refs #441 ] Add secret to filter. Add repository key exist check
2012-07-13 18:16:56 +04:00
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04:00
26617b7739
[refs #90 ] add close/reopen button
2012-07-12 20:15:28 +06:00
d9755f295c
Merge pull request #567 from warpc/523-block_import
...
[refs #523 ] Fix periodically error ActiveRecord::RecordNotFound in Resque service
2012-07-11 13:48:10 -07:00
5b93ef9134
[refs #523 ] limit callback only for create action(update)
2012-07-12 00:40:55 +04:00
84f4d7d423
[refs #523 ] limit callback only for create action
2012-07-12 00:24:31 +04:00
b22a2ce3ba
[refs #523 ] Fix periodically error ActiveRecord::RecordNotFound in Resque service
2012-07-12 00:01:41 +04:00
65f94e763e
[refs #90 ] add the commit merge message
2012-07-10 23:13:23 +06:00
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06:00
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
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
1de9277e4a
[refs #442 ] Add main? method for platforms
2012-07-10 11:06:08 +04:00
f997e50905
[issue #561 ] Some cosmethic changes.
...
* Reordered columns in BuildLists table
* Reordered rows in BuildLists filter
* Removed created_at filter (Commented. See TODOs)
2012-07-10 01:49:19 +04:00
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
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
620d78fd1b
[refs #442 ] MassBuilds create refactor and specs fix
2012-07-09 20:48:31 +04:00
adc917ca3b
[refs #442 ] MassBuild data initialize refactor
2012-07-09 20:13:02 +04:00
d7ee0fe938
Merge pull request #559 from warpc/428-advisory
...
[refs #428 ] Advisory: new look
2012-07-09 08:44:13 -07:00
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
1f2a3b82d3
[refs #442 ] Add tests for mass builds and attr_accessible. Fix ability
2012-07-06 20:49:21 +04:00
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
a2d35d2538
[issue #527 ] Use User#fullname instead of string.
2012-07-04 19:53:18 +04:00
Vokhmin Alexey V
Alexander Machehin
Vladimir Sharshov
vladdruzh
konstantin.grabar
Pavel Chipiga
Pasha
George Vinogradov
Pavel Shved
George Vinogradov