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
68dbae8c83
#698 : added #create and #fork actions for Advisories API
2012-10-18 18:17:50 +04: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
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
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
432e219571
#692 : some refactoring
2012-10-16 17:42:52 +04: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
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
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
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
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
9087a15627
#672 : small refactoring Api::V1::BaseController#member method
2012-10-15 14:07:10 +04: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
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
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
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
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
824ee79452
[refs #579 ] redirect to created comment
2012-10-08 15:20:45 +06:00
ed7aec602f
[refs #579 ] alpha version of the pull inline comments
2012-10-06 01:19:05 +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
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
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
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
cb994c6fd6
#349 : created autocompletes_controller, refactoring, updated specs
2012-10-02 20:54:55 +04:00
b3fd95d7fa
[refs #90 ] always redirect to pull on update action
2012-10-02 21:27:15 +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
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
f92f209323
[refs #90 ] fixed changing base project
2012-10-01 23:43:15 +06:00
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
90069b2fb6
[#refs #90 ] fix pull flashes
2012-09-28 23:45:27 +06:00
fbc537174e
[refs #90 ] search base project by fullname
2012-09-28 21:39:45 +06:00
abafbc6ef5
Merge again-and-again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-09-28 00:09:34 +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
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
6f889b15a9
#90 : added access to show pull requests
2012-09-26 19:39:47 +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
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
dbf1a5f8ca
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 15:27:54 +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
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
84378afc3d
#648 : small code optimization
2012-09-25 13:36:50 +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
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
7812adfdbc
[refs #374 ] Add custom http basic auth for api
2012-09-21 23:15:56 +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
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +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
9d2c9ae2b3
#385 : added rsa to name of archives for git branches
2012-09-20 00:38:40 +04:00
f39adfd2f7
#385 : fixed specs, updated controller, view
2012-09-19 23:29:36 +04:00
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +06:00
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06: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
fe20814b5a
#633 : hot fix
2012-09-13 20:18:09 +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
1a75a5a394
#638 : updated Relation model, repositories and platforms controllers according to comments
2012-09-12 23:32:51 +04:00
e3bcd2382e
[refs #641 ] Show only public projects in group profile
2012-09-12 18:49:40 +04:00
3b622f54b9
#638 : added before_filter to repositories_controller
2012-09-12 17:43:02 +04:00
bc4043e558
#638 : hot fix
2012-09-12 17:25:46 +04:00
b468b09529
#638 : some refactoring for adding new user
2012-09-12 17:07:34 +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
5f941844f2
#637 : added migration, updated approve_notification
2012-09-10 15:08:53 +04: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
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
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
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +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
b9a622acec
[refs #374 ] Add unixtime search and output. Fix rate limit configuration and 404 status
2012-09-05 17:47:25 +04:00
ec32cf7fa0
[refs #630 ] swap tour conten for porject and build pages
2012-09-04 18:30:02 +04:00
ff8f9da14f
[refs #374 ] Refactor api build list create method
2012-09-04 16:44:28 +04:00
5d0d972a0d
[refs #374 ] Refactor api build lists create logic
2012-09-03 17:49:11 +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
6229daf137
[refs #374 ] Add paginate restriction for API
2012-08-31 16:23:44 +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
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
1c3ca85f03
[refs #616 ] add comment for clarity
2012-08-27 15:43:44 +06:00
2c0826a77d
[refs #616 ] fixed showing body after update
2012-08-25 23:40:51 +06:00
4b4007651d
[refs #616 ] small refactoring issues controller
2012-08-25 23:38:11 +06:00
e8d80b849a
[refs #616 ] fixed removing labels from issue
2012-08-25 21:26:24 +06:00
f6cc919f2f
[issue #620 ] Removed MaintainersController#assignee
2012-08-24 23:45:58 +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
629e227d9a
Fix Maintainers spec for anons
...
it doesn't create guest user now, and relies on anonymous_access
config variable instead.
2012-08-22 00:02:34 +04:00
028e511409
Remove 'heavy' rescues from maintainer-db api
2012-08-22 00:02:33 +04:00
8629d67030
Add javascript callback for "assignee"
...
To make intrgration with external trackers easier, add JS API for
assignee retrieval. It returns a script that calls a function that
should act somehow depending on how it was defined.
2012-08-21 23:58:15 +04:00
e75a676895
Add "assignee" JSON callback
...
The callback reports the assignee of a package in a platform given.
Used for integration with external bug trackers.
2012-08-21 23:58:15 +04:00
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
5dc50056df
[refs #374 ] Add repositories, platforms and projects read API
2012-08-21 14:19:38 +04:00
1142f9ee8c
[refs #616 ] fixed searching collaboratots to assignment
2012-08-20 23:37:22 +06:00
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
6d4e369322
[refs #374 ] Change project_version set method
2012-08-16 15:11:46 +04:00
554950a14c
[refs #374 ] Fix some tests. Comment 500 error cautch
2012-08-15 19:58:22 +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
9712683c62
[refs #374 ] Change commit_hash save on create. Continue specs refactor
2012-08-14 17:45:21 +04:00
7fba004858
[refs #374 ] Api tests refactor
2012-08-13 13:58:26 +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
c1c9f9680e
[refs #90 ] remove code duplication
2012-08-10 22:40:09 +06:00
e535ff2fed
Merge pull request #611 from warpc/590-build_list_page_change
...
[refs #590 ] Dirty hack to fix BuildList#index
2012-08-10 09:26:11 -07:00
e7407ae28f
[issue #590 ] Dirty hack to fix BuildList#index
2012-08-10 19:08:26 +04:00
45169faf2f
Merge pull request #609 from warpc/590-build_list_page_change
...
[refs #590 ] add time notification and periodic page update
2012-08-09 14:49:12 -07:00
1d5470b7d6
[refs #90 ] small fixes
2012-08-09 23:56:55 +06:00
134b386631
[refs #374 ] Fix api and build_lists tests
2012-08-09 18:38:41 +04:00
1728148d38
[refs #374 ] Small api actions refactor
2012-08-08 23:16:27 +04:00
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
7f475948f6
[refs #374 ] Uncomment 404/500/503 rescues
2012-08-08 18:08:56 +04:00
e0ee7bd086
[refs #374 ] Add jbuilder responses for api
2012-08-08 17:02:51 +04:00
edf882f2a1
[refs #90 ] remove unneeded method
2012-08-08 00:17:10 +06:00
6225410720
[refs #90 ] enable check for uniq pull requests
2012-08-08 00:06:49 +06:00
61b02ce1e8
[refs #90 ] fixed error on create
2012-08-08 00:05:43 +06:00
e97c3dc645
[refs #90 ] small controller refactor
2012-08-07 22:34:22 +06:00
2a6b08c269
[refs #90 ] fixed error with wrong treeish
2012-08-07 22:24:47 +06:00
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
61ca25a820
[issue #590 ] Eager loading of BuildList's owner and repository.
2012-08-07 01:41:57 +04:00
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +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
dd1bf7719f
[refs #601 ] Add statuscheck for destroy action in product build list(small fix)
2012-08-06 17:08:13 +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
94178c6ee3
[issue #590 ] Removed unnecessary check from controller.
2012-08-06 15:03:10 +04:00
b963c9342a
[issue #590 ] Repository fetches through project and platform
2012-08-06 14:59:07 +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
f3db00832a
[refs #374 ] Api v1 base functional and specs
2012-08-03 14:05:05 +04:00
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06: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
89d67f9ea6
[refs #441 ] Refactring, fix errors
2012-07-30 23:08:14 +04:00
6c11597de6
Merge branch 'master' into 90-pull
2012-07-30 16:53:59 +06:00
f674735c8c
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-07-30 13:31:28 +04:00
63801e2676
[issue #590 ] Platform fetches through repository.
2012-07-27 23:37:56 +04:00
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
255bd3a73a
Merge pull request #589 from warpc/551-old_bugs_with_by_object
...
[refs #551 ] by_object changed to by_actor.
2012-07-27 06:45:34 -07:00
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06:00
2105457d62
Merge pull request #587 from warpc/586-datatables_json_fixes
...
[refs #586 ] Custom JSON generators changed to JBuilder
2012-07-27 05:45:23 -07:00
bbb03d3243
[issue #586 ] Removed @total_project & @total_user.
2012-07-27 16:40:13 +04: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
5aecdc203b
Merge pull request #571 from warpc/263-refactoring
...
[refs #263 ] Big git refactoring
2012-07-27 04:51:34 -07:00
40b0bb4b58
[issue #551 ] by_object changed to by_actor.
2012-07-27 08:12:09 +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
03cc4668dc
[issue #586 ] Custom JSON generators changed to JBuilder
2012-07-27 00:25:44 +04:00
48f8c3ad08
[refs #374 ] Add json responses for build lists api
2012-07-26 13:22:51 +04:00
6f4f48cbce
[issue #578 ] Fixed error handling in PresonalRepository.
2012-07-26 01:49:55 +04:00
e09a9467e2
Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576
2012-07-25 21:05:25 +03:00
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +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
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
2feb03601b
[refs #90 ] fixed authorize of the merge action
2012-07-16 22:35:44 +06: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
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06:00
43d2c1b223
[refs #90 ] fix after fail of the pull creation
2012-07-10 22:10:24 +06:00
4663babac6
[refs #90 ] redirect to right place after create
2012-07-10 21:48:11 +06:00
65c139b922
[refs #90 ] dont show empty projects
2012-07-10 19:29:10 +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
Vokhmin Alexey V
Alexander Machehin
Vladimir Sharshov
konstantin.grabar
Pavel Chipiga
George Vinogradov
Pavel Shved
George Vinogradov