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