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
Vokhmin Alexey V
Vladimir Sharshov
Alexander Machehin
konstantin.grabar
Pavel Chipiga
Pasha