bdc2cd78fb
[refs #758 ] add default branch validation
2012-12-06 13:18:16 +06:00
d0179d03b6
#751 : add url to file-store into the application.yml
2012-12-05 14:56:59 +04:00
128b4104f1
#751 : update link to version of BuildList::Item
2012-12-04 20:13:55 +04:00
5defd009d3
#751 : show link to diff in "Items" section
2012-12-04 19:48:30 +04:00
b4472a1403
#751 : open logs of (Product)BuildList in new window
2012-12-04 19:20:59 +04:00
d39c07475f
Merge pull request #748 from warpc/735-fetch-data-for-container
...
[refs #735 ]: fill packages of BuildList when use new_core
2012-12-04 03:36:47 -08:00
0a88010a83
fix pagination
2012-12-04 17:12:51 +06:00
bd25c4aa3d
[refs #674 ] add last published commit to api
2012-12-04 16:40:05 +06:00
51bf88c892
[refs #674 ] rename column
2012-12-04 16:24:28 +06:00
ef860ed737
fix invalid value for Integer()
2012-12-04 16:18:36 +06:00
9e5a7e3fdb
[refs #674 ] fix get last published commit
2012-12-04 15:59:16 +06:00
42e76f5fa6
[refs #674 ] fix undefined method 'last_published_commit_hash' for product build list
2012-12-04 09:33:04 +06:00
5019d27b50
[refs #674 ] small helper refactoring
2012-12-04 00:09:36 +06:00
3432b6af49
[refs #674 ] change comments
2012-12-04 00:06:31 +06:00
bff88e86e3
[refs #674 ] small diff message for build lists
2012-12-04 00:04:03 +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
3ef841184c
fill packages of BuildList when use new_core
2012-12-03 21:17:20 +04:00
0669fb2789
[refs #674 ] small changes
2012-12-03 22:52:11 +06:00
d325838b1f
Merge branch 'master' into 735-package-build-server
2012-12-03 15:38:03 +04:00
ee73df5d3a
disable auto_publish for new_core, some refactoring
2012-12-03 15:28:27 +04:00
611402c4c2
[refs #674 ] add stats
2012-12-03 17:11:55 +06:00
ec57f0ba9a
Merge pull request #738 from warpc/732-maintainer-db-api
...
[refs #732 ] add maintainers api
2012-11-30 09:33:21 -08: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
bc1ab2f8aa
show results-table only for BuildList with new_core
2012-11-30 14:55:14 +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
364e5d9b67
[refs #736 ] add to api build lists of the project
2012-11-29 23:52:15 +06: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
8ca41377fc
[refs #736 ] add git url
2012-11-28 23:25:28 +06:00
efd2945508
[refs #733 ] change error message
2012-11-28 21:29:34 +06:00
b8e6903faa
[refs #733 ] small refactoring
2012-11-28 20:52:11 +06:00
663db6e7ff
[refs #733 ] add check for correct answer
2012-11-28 20:43:38 +06:00
76606036cb
[refs #737 ] remove branch from commit message
2012-11-28 19:15:15 +06:00
0545863642
refactor
2012-11-28 10:04:40 +04:00
8ed71e0f03
[refs #674 ] fixed undefined method 'binary?' for nil:NilClass when rename the file
2012-11-27 23:35:58 +06: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
c42fcc824a
add to api maintainers index method
2012-11-26 15:32:23 +04:00
af2be3fb09
create logical model for serach by ABF
2012-11-21 19:04:41 +04:00
7fcd3d6780
update url for search results
2012-11-21 17:49:34 +04:00
c629c91bb7
rename constants
2012-11-21 16:55:57 +04:00
6b842bb51a
add Search API, some refactoring
2012-11-21 16:09:01 +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
95d262b92f
fix build list pagination
2012-11-14 23:56:00 +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
34bb256ff1
Merge pull request #715 from warpc/iso-worker
...
[refs #711 ] Integration Iso worker
2012-11-14 03:14:28 -08:00
8ad53f4c0b
[refs #90 ] create a "new" pull at another dir
2012-11-14 16:52:26 +06:00
8df87ed292
[refs #90 ] fixed error on create
2012-11-14 16:51:10 +06:00
38c7aa3008
updated view
2012-11-13 19:55:10 +04:00
9c0ae23927
small refactoring
2012-11-13 20:29:59 +06:00
21a32fba6c
show expected message after add member error
2012-11-13 20:29:45 +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
7ac93584ad
small refactoring of views
2012-11-12 20:49:04 +04:00
45ed0c0d51
small refactoring
2012-11-12 20:41:12 +04:00
51aff682d4
some refactoring according to Alexander's comments
2012-11-12 20:23:11 +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
8032437585
remove crontab
2012-11-09 21:56:39 +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
ef967e97ae
small style changes
2012-11-09 17:51:33 +04:00
1db2115fb0
add function for update page page automatically
2012-11-09 17:31:35 +04: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
fc3dbbf698
added help for creating ISO
2012-11-08 15:11:44 +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
f21926f7f5
extra style changes
2012-11-07 17:21:08 +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
317f672e32
added #new action for create ISO build
2012-11-06 19:08:54 +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
217a92b443
[refs #90 ] fix pull header
2012-10-28 00:45:24 +06:00
58a9c68951
[refs #90 ] fixed rendering a new pull
2012-10-28 00:44:42 +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
ba74024b29
fixed order of the handle exceptions
2012-10-25 15:42:47 +06:00
4f2d75ea40
#709 : removed unnecessary template
2012-10-22 13:16:58 +04:00
05f16c1d13
#709 : updated controller and view for fixing undefined local variable or method 'project_counter'
2012-10-22 12:26:00 +04:00
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
25620af00c
hot fix for specs
2012-10-19 19:35:19 +04:00
ec6621a5ec
#706 : small refactoring Advisories#show API view
2012-10-19 18:56:29 +04: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
f67a8b3692
#706 : some refactoring, updated build_list API response
2012-10-19 18:24:28 +04:00
18ac16ae96
#698 : small refactoring, added ckeck for main platform
2012-10-19 18:03:09 +04:00
b9f1835d1c
Merge branch 'master' into 698-rest-api-for-advisories
2012-10-19 17:58:38 +04:00
4680e9c62c
#706 : added #projects action to Repositories API
2012-10-19 17:52:36 +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
9bc9eab4f1
[refs #579 ] remove new comment form after close & fix focus
2012-10-19 18:39:11 +06:00
eda6ea4691
[refs #704 ] Fix height button "Clear"
2012-10-19 16:38:01 +04:00
9c62029f6d
[refs #619 ] Fix long title in the activity feed
...
not observant
2012-10-19 16:07:19 +04:00
1d041667a3
Merge pull request #705 from warpc/702-handling-errors-on-api-requests
...
[refs #702 ]: correct response for 404 and 500 code in REST API
2012-10-19 05:02:48 -07:00
81c80b42e8
[refs #619 ] Fix long title in activity feed
2012-10-19 15:54:32 +04:00
d563c9a9f9
#702 : added handling errors
2012-10-19 15:47:49 +04:00
ef77f16fac
[refs #619 ] Fix end-of-line format
2012-10-19 14:38:38 +04:00
ad27738ce9
[refs #619 ] Fix radio-button in Opera
2012-10-19 14:27:14 +04: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
5cf69bff92
#698 : renamed method
2012-10-18 20:36:29 +04:00
8bbb82faa8
#698 : updated Advisories API
2012-10-18 20:25:24 +04:00
84e5f3ead3
#698 : updated specs, permission access
2012-10-18 19:44:28 +04:00
d5ad5b1a95
Merge branch 'master' into 698-rest-api-for-advisories
2012-10-18 18:59:00 +04:00
a3252594b8
#698 : fixed #index action in Advisories controller
2012-10-18 18:32:43 +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
00a8858348
#698 : updated Advisories#show API
2012-10-18 17:08:40 +04:00
ecf8e7e5ee
[refs #579 ] fixed wiki & refactoring
2012-10-18 18:51:28 +06:00
c6f45956cc
[refs #90 ] fixed error by 24fd99b2d5cab
2012-10-18 18:50:43 +06: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
b7eff22c23
#698 : added API for Advisories
2012-10-18 15:22:31 +04: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
a89380c4e2
#686:small refactoring
2012-10-17 16:46:19 +04:00
4e075ac121
#686 : created owner partial, small refactoring
2012-10-17 16:35:56 +04:00
2d067a45ca
#686 : added members action for project API
2012-10-17 16:18:52 +04:00
351821912b
#686 : added API for show list of projects
2012-10-17 14:35:33 +04:00
f0caf6a9f9
#692 : updated groups/profile_controller
2012-10-16 20:38:49 +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
f060d919d9
[refs #579 ] add new helper
2012-10-16 19:20:55 +06:00
df105efd56
#692 : added #update_member action for Groups API
2012-10-16 17:03:18 +04:00
5795e1cea5
#692 : updated API
2012-10-16 16:35:30 +04:00
7327d195c4
#692:added show action for Groups API
2012-10-16 15:51:14 +04:00
d99a2104ce
#692:added index action for Groups API
2012-10-16 15:49:07 +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
a807a22230
[refs #579 ] remove debug code
2012-10-16 14:07:26 +06:00
0c475b35f7
Merge pull request #694 from warpc/691-rest-api-for-users
...
[refs #691 ]: REST API for Users
2012-10-15 12:10:12 -07:00
888cbe445e
#691 : small refactoring
2012-10-15 22:30:06 +04: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
5c7fb21511
[refs #579 ] add cursor pointer to arrow
2012-10-16 00:16:01 +06:00
cef112efc3
[refs #579 ] first version of the outdated diff
2012-10-16 00:14:43 +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
ef37180825
[refs #579 ] small activity refactoring
2012-10-15 22:50:21 +06:00
fb1288e382
[refs #579 ] ugly sorting common pull comments
2012-10-15 22:33:16 +06:00
6aef7cfb30
#691 : revert base controller
2012-10-15 19:49:52 +04:00
f3605a1211
#691 : updated routes according to Vladimir's comments
2012-10-15 19:47:42 +04:00
c115a37a04
Merge pull request #695 from warpc/add-invitation-link-to-register_requests-table
...
added invitation link to the table
2012-10-15 08:28:35 -07:00
a7a442c4e1
[refs #90 ] fixed rendering diff
2012-10-15 21:24:29 +06:00
3e0b3b8bfc
added invitationlink to the table
2012-10-15 19:24:20 +04:00
5aa5bbc0b8
#691 : small refactoring
2012-10-15 18:50:58 +04:00
84b49052b1
#691 : added specs for Users API
2012-10-15 18:43:09 +04:00
0879a7e46f
#691 : added #notifiers and #update actions for Users API
2012-10-15 18:06:08 +04:00
2ae671df21
Merge branch 'master' into 691-rest-api-for-users
2012-10-15 17:03:05 +04:00
1ee9e3f00e
[refs #579 ] fixed updating comment
2012-10-15 18:30:34 +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
9087a15627
#672 : small refactoring Api::V1::BaseController#member method
2012-10-15 14:07:10 +04:00
00323cec82
[refs #579 ] grouped commits
2012-10-15 16:03:35 +06:00
5d9a1e2586
#672 : removed API helper
2012-10-15 13:48:25 +04:00
e50bd3a2b5
#691 : added #show action for Users API
2012-10-15 13:45:00 +04:00
fae5d3ff2b
#690 : truncate project name before validation
2012-10-15 12:28:18 +04:00
5c88ac6f3e
#672 : updated Repositories#signatures API action, added specs
2012-10-14 18:44:10 +04:00
00f5d0ce62
#672 : updated Repositories API
2012-10-14 17:38:06 +04:00
146f72c062
#672 : small refactoring
2012-10-14 16:39:58 +04:00
be8ed0984a
#672 : added #add_member, #remove_member, #update, #destroy actipns for Repository API
2012-10-14 16:00:49 +04:00
b9d69a966b
[refs #579 ] add 404 for wrong commit hash
2012-10-13 01:59:14 +06:00
c5d6707b8f
[refs #579 ] fixed commit comments errors
2012-10-13 01:57:54 +06:00
bb47567628
[refs #579 ] small improvements of the discussion
2012-10-13 00:12:04 +06:00
6981a7f238
[refs #648 ] disable submiting the project filter form
2012-10-12 16:24:51 +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
8f3ed58cd8
#671 : added Projects#refs_list API action
2012-10-11 20:27:17 +04:00
7f031ac688
[refs #374 ] added commit validation
2012-10-11 22:11:53 +06:00
6b3bf41c7a
#671 : removed before_filter
2012-10-11 19:36:14 +04:00
992892f2c8
#671 : small refactoring
2012-10-11 19:18:54 +04:00
a7bb5f48ba
[refs #90 ] fixed wiki diff
2012-10-11 01:16:47 +06:00
e379a603b4
[refs #90 ] get new pull to this project
2012-10-11 00:59:25 +06:00
05d222e9de
#671 : updated output errors
2012-10-10 21:51:00 +04:00
eef640e82c
#671 : added API Platforms#create action, updated specs, added validation to platform model
2012-10-10 21:45:56 +04:00
919459617a
#671 : small refactoring
2012-10-10 20:31:22 +04:00
0841c4d705
added 400 error for API BuildLists#create action
2012-10-10 20:19:00 +04:00
972877bc76
#671 : added API Platforms#destroy action and specs
2012-10-10 19:43:14 +04:00
d9c583e226
#671 : added specs for API Platforms#clone action
2012-10-10 19:13:14 +04:00
e6bb63db08
#671 : removed restrict_paginate method
2012-10-10 16:02:59 +04:00
e5c6707594
#671 : added #remove_member action for platforms API, updated specs
2012-10-09 21:07:10 +04:00
30909b281d
#671 : added #add_member action for platforms API, added new specs
2012-10-09 20:23:48 +04:00
9e6e2de955
#671 : added #members action for platforms API
2012-10-09 19:06:27 +04:00
abe31b3c2e
#671 : added API #update action for platform
2012-10-09 18:46:20 +04:00
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
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
feefe8ed89
#374 : added #platforms_for_build action for Platforms API
2012-10-08 22:02:44 +04:00
a5477926bc
[refs #579 ] fix checking path
2012-10-08 21:36:46 +06:00
fcfdf1b26b
[refs #579 ] change 'base' & 'head' -> 'to' & 'from'
2012-10-08 21:36:23 +06:00
70e8a1fe0d
[refs #579 ] unless -> if
2012-10-08 21:33:43 +06:00
21b7b0d0b1
[refs #579 ] dont create wrong comment
2012-10-08 21:31:30 +06:00
3241b7a55a
[refs #579 ] save additional info for pull inline comments
2012-10-08 20:54:36 +06:00
548f698526
[refs #579 ] add a line comment button
2012-10-08 20:42:38 +06:00
ec0ec5fc32
#374 : revert some changes
2012-10-08 17:37:09 +04:00
b1a9e2aa21
#374 : updated api for projects
2012-10-08 16:47:02 +04:00
824ee79452
[refs #579 ] redirect to created comment
2012-10-08 15:20:45 +06:00
f12634cee8
[refs #579 ] add link to comments
2012-10-08 15:14:31 +06: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
49946f4f53
[refs #90 ] fix creating a blocked pull
2012-10-05 23:31:06 +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
afa6dd0706
[refs #579 ] fixed style
2012-10-05 15:39:07 +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
a24ea9a4b1
[refs #579 ] fixed & refactoring markdown help
2012-10-05 14:16:27 +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
b3123a752e
#671 : updated build list api
2012-10-04 19:38:33 +04:00
21a0d982f1
#671 : updated arch field in json for build_lists API
2012-10-04 19:30:31 +04:00
f5d0d9f20b
#671 : added filter platforms by type
2012-10-04 17:34:30 +04:00
df0251282d
#671 : updated API arches controller, added specs
2012-10-04 17:13:55 +04:00
4b72501159
#671 : added Architectures API
2012-10-04 16:45:49 +04:00
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
ad50934bab
#624 : fixed downloading RAW files
2012-10-04 01:20:07 +04:00
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
33209e7200
hotfix for downloading 'tar' archives
2012-10-04 00:27:13 +04:00
04b2647ef0
#668 : added uploading avatars for groups
2012-10-03 20:38:42 +04:00
bf7bc8787a
[refs #90 ] small controller refactoring
2012-10-03 17:59:18 +06:00
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
1d424b463c
[refs #90 ] fix when creating new pull
2012-10-03 09:21:16 +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
b3fd95d7fa
[refs #90 ] always redirect to pull on update action
2012-10-02 21:27:15 +06:00
ba7a7b20a5
#349 : updated locales, added shared template
2012-10-02 19:20:58 +04: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
f66f80c128
Merge branch 'master' into 90-ui
...
Conflicts:
spec/controllers/projects/pull_requests_controller_spec.rb
2012-10-02 19:43:23 +06:00
d36155ec7f
[refs #90 ] remove useless abilities
2012-10-02 19:24:53 +06:00
ffe38b0a08
#349 : updated Users::ProfileController and Groups::ProfileController
2012-10-02 16:04:26 +04:00
35c965a796
[refs #90 ] add all ancestors to base project choise
2012-10-02 15:20:48 +06:00
d948949532
[refs #90 ] new pull optimization
2012-10-02 15:14:31 +06:00
226f1b592c
Merge pull request #663 from warpc/90-add-specs-for-pull-requests
...
[refs #90 ]: add specs for pull requests
2012-10-01 11:12:01 -07:00
8f011316c3
[refs #90 ] possible fix for nil commom ancestor commit
2012-10-01 23:52:18 +06:00
f92f209323
[refs #90 ] fixed changing base project
2012-10-01 23:43:15 +06:00
948e0892bf
[refs #90 ] markdown in create pull
2012-10-01 22:48:26 +06:00
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
3271fd8479
#658 : small refactoring
2012-10-01 17:33:46 +04:00
234615d728
#658 : added link to notification center in email
2012-10-01 17:08:02 +04:00
c4e974a89e
Merge branch 'master' into 90-add-specs-for-pull-requests
2012-10-01 15:42:06 +04:00
9b9295ba4f
[refs #90 ] change ui on create pull
2012-09-28 23:46:02 +06:00
90069b2fb6
[#refs #90 ] fix pull flashes
2012-09-28 23:45:27 +06:00
64ee8b6845
[refs #90 ] change pull header
2012-09-28 21:49:10 +06:00
fbc537174e
[refs #90 ] search base project by fullname
2012-09-28 21:39:45 +06:00
fb8d1ded5f
#90 : added some specs for pull requests
2012-09-28 19:08:51 +04: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
847ecc2a15
[refs #374 ] Remove unused data from build list api
2012-09-28 14:38:01 +04:00
e310f5607c
#90 : removed unnecessary code
2012-09-27 23:30:59 +04:00
7e09f17b58
Merge branch 'master' into 90-create-discussion-in-the-pull-requests-like-github
2012-09-27 22:37:54 +04: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
bd04e8ea75
#90 : revert changes in the controller
2012-09-27 21:54:40 +04:00
dfada7a270
#90 : fixed NoMethodError on #show page for guest
2012-09-27 21:21:10 +04:00
3fdca32e0e
#90 : updated styles
2012-09-27 20:59:48 +04:00
da006871ba
#90 : small refactoring, moved views
2012-09-27 20:32:28 +04:00
f41aaecd72
#90 : added commits and comments for commits to pull-request discussion
2012-09-27 19:40:19 +04: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
223aa33604
[refs #374 ] Add info about API doc site
2012-09-27 17:55:16 +04:00
7c4c855341
[refs #374 ] Small refactoring
2012-09-27 17:41:02 +04:00
a20e1552cc
[refs #374 ] Fix test, small refactoring.
2012-09-27 16:13:59 +04:00
0dd103b7f4
[refs #374 ] Fix build list tests, remove unused code.
2012-09-27 03:54:56 +04:00
77b57cce11
[refs #374 ] Fix support http basic auth, fix tests, fix abilities.
2012-09-26 21:15:11 +04:00
a994e7dd74
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 23:10:45 +06:00
4100b875bd
[refs #90 ] fixed access
2012-09-26 23:10:04 +06:00
cc05fa695a
[refs #90 ] fixed pull abilities part 2
2012-09-26 23:09:29 +06:00
37fbb4632e
#90 : updated branch
2012-09-26 21:04:12 +04:00
613db04375
#90 : added limit for commits into the pull request
2012-09-26 21:00:58 +04:00
5f0e683711
#90 : moved code
2012-09-26 19:41:00 +04:00
6f889b15a9
#90 : added access to show pull requests
2012-09-26 19:39:47 +04:00
0ebc545b01
#90 : small refactoring of views
2012-09-26 19:16:34 +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
ccb004bc03
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-09-26 16:27:46 +06:00
dbf1a5f8ca
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 15:27:54 +06:00
eba6a14e0b
[refs #90 ] very small refactoring
2012-09-26 15:27:24 +06:00
3491492c8d
[refs #90 ] fixed pull authorization
2012-09-26 15:24:46 +06:00
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +04:00
47a73a4ddb
[refs #90 ] fixed existing project name
2012-09-25 21:47:08 +06:00
d54a50e2e0
#90 : added line-height style
2012-09-25 19:31:06 +04:00
0299c069c6
#90 : style changes for header, increase performanse for #autocomplete_base_project action
2012-09-25 19:18:22 +04: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
40999debbf
#648 : updated projects_helper
2012-09-25 13:50:28 +04:00
06e15cf3fa
[refs #616 ] remove unneeded code
2012-09-25 15:47:12 +06:00
a29a2f8fe9
[refs #616 ] change ability for preview
2012-09-25 15:46:19 +06:00
84378afc3d
#648 : small code optimization
2012-09-25 13:36:50 +04:00
d15094f128
#648 : moved 'Create' button
2012-09-25 00:03:33 +04:00
91f215351c
#648 : small refactoring according to comment
2012-09-24 23:27:00 +04:00
0bb9f38b66
#648 : collor for labels has been changed
2012-09-24 22:44:06 +04:00
1e468b5073
#648 : updated styles, added icons for filters
2012-09-24 22:36:02 +04:00
768f4b1dfb
#648 : renamed parametr
2012-09-24 22:07:53 +04:00
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
2c6d4bae9e
[refs #616 ] add error messages to ajax
2012-09-24 23:34:14 +06:00
f4bbeaaa46
[refs #616 ] fixed 500 when failed to create comment
2012-09-24 23:01:04 +06:00
fc672451c6
[refs #616 ] small changes in styles
2012-09-24 21:19:50 +06:00
eaf71f9cc0
[refs #652 ] set url options for mailer
2012-09-24 19:02:21 +06: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
7812adfdbc
[refs #374 ] Add custom http basic auth for api
2012-09-21 23:15:56 +04:00
ceeae09332
#648 : small revert, updated filter name
2012-09-21 22:08:19 +04:00
c14f2851e3
#648 : revert changes
2012-09-21 22:04:58 +04:00
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
5bcebcf384
[refs #374 ] Add publish_without_qa field, fix some specs, update docs for auth
2012-09-21 18:30:40 +04:00
b5bee35275
Revert "[refs #616 ] add table styles"
...
This reverts commit 1818f25de28de0e9efa8d1ae9e22649445d3953d.
2012-09-21 19:23:41 +06:00
1f63fec004
Revert "[refs #616 ] dont filter html"
...
This reverts commit 68eac7a9de083d6a29503ac2900b3dd404e22c0c.
2012-09-21 19:22:27 +06:00
855f1f356d
[refs #616 ] remove some inline styles
2012-09-21 18:10:47 +06:00
651be997b3
[refs #616 ] add table styles
2012-09-21 17:46:44 +06:00
94c3863e27
[refs #616 ] fixed markdown image example
2012-09-21 16:43:54 +06:00
d25bdb2329
[refs #616 ] fixed preview bug
2012-09-21 16:32:53 +06:00
b65ca14131
[refs #616 ] small js refactoring
2012-09-21 16:31:55 +06:00
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
96f8a9a43f
[refs #616 ] dont filter html
2012-09-20 23:48:20 +06:00
378fe5847e
[refs #616 ] ugly replaces
2012-09-20 23:10:50 +06:00
e027eee40c
[refs #374 ] Update api platforms list docs and code
2012-09-20 19:07:06 +04:00
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
7e28920bc7
Merge pull request #653 from warpc/385-change-name-for-git-archives
...
[refs #385 ] Support download project source code by build clients(rpmbuild)
2012-09-20 06:37:13 -07:00
b398a0e456
#634 : fixed
2012-09-20 16:43:23 +04:00
07f5224e76
#385 : removed before_filter
2012-09-20 15:21:54 +04:00
c76618441e
#385 : revert some changes according to discussion
2012-09-20 15:10:52 +04:00
805521c486
Merge branch 'master' into 385-change-name-for-git-archives
2012-09-20 14:53:29 +04:00
0acc4ce1c7
Improve invite email(prevent falling into the spam)
2012-09-20 12:29:07 +04:00
7a8b68b90b
small refactoring
2012-09-20 00:54:15 +04:00
9d2c9ae2b3
#385 : added rsa to name of archives for git branches
2012-09-20 00:38:40 +04:00
17bdcf9a3c
updated model according to last comments, added new specs
2012-09-19 23:52:18 +04:00
f39adfd2f7
#385 : fixed specs, updated controller, view
2012-09-19 23:29:36 +04:00
32e05de186
[refs #616 ] cheat sheet small i18n
2012-09-20 00:53:40 +06:00
11c67b7951
[refs #616 ] fixed bug on new issue
2012-09-19 23:59:46 +06:00
fbc5f3a925
[refs #616 ] small refactoring
2012-09-19 23:59:14 +06:00
a85a95d18a
[refs #616 ] markdown cheat sheet
2012-09-19 23:35:43 +06:00
426eb72d5f
moved #notify_users method from observer to model, updated specs
2012-09-19 17:55:17 +04:00
4fc9ba7aeb
[refs #616 ] add lost i18n
2012-09-19 15:41:08 +06:00
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +06:00
7fbf17a824
updated email templates
2012-09-18 19:34:39 +04:00
967c5daaa8
#575 : added 'arch' to subject and body of email
2012-09-18 16:03:10 +04:00
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06: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
15a75077db
Merge branch 'master' into 575-email-notification-for-build-tasks
2012-09-17 17:49:43 +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
5326098884
#575 : updated email template
2012-09-16 22:02:28 +04:00
ef923d06c7
#575 : added build_list_notification
2012-09-16 21:29:45 +04:00
01576702a0
#575 : added migration, updated Settings page
2012-09-14 20:12:48 +04:00
7bb0ced8cb
#645 : fixed.
2012-09-14 18:49:08 +04:00
c690a8446a
Merge pull request #644 from warpc/633-fix-ui-on-build-list-page
...
[refs #633 ] Fixed blocking auto publication in personal repository. Refactoring creating build list page.
2012-09-13 16:39:19 -07:00
6bdaf06d86
#633 : removed unnecessary code
2012-09-14 02:30:54 +04:00
bdb3eb288c
#633 : removed checkbox from name of platform
2012-09-14 02:22:10 +04:00
fc4eb189b5
Add new staging server;
...
Remove special application config;
Change localization (builded to built);
Add quotes to git command.
2012-09-14 00:46:56 +04:00
fe20814b5a
#633 : hot fix
2012-09-13 20:18:09 +04:00
ba6805598f
#633 : small refactoring
2012-09-13 20:16:13 +04:00
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08: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
87b71cf611
Merge pull request #643 from warpc/641-enable-disable-project-from-private-repository
...
[refs #641 ] Include/exclude project from personal owner repository according to value of option project is package
2012-09-12 13:39:56 -07:00
Alexander Machehin
Vokhmin Alexey V
Vladimir Sharshov
vladdruzh
Julea Pikareva
konstantin.grabar