Alexander Machehin
0d9c095cbd
[refs #847 ] remove old core code
2013-01-24 12:33:16 +06:00
Alexander Machehin
eeb58ccd8e
Merge pull request #799 from warpc/794-move-all-keys-into-abf-bd
...
#794 : move all keys into abf bd
2013-01-22 00:17:42 -08:00
Vokhmin Alexey V
86034c5da4
#843 : update pages for using only new_core
2013-01-21 19:52:20 +04:00
Vokhmin Alexey V
9e018c2cff
Merge branch 'master' into 794-move-all-keys-into-abf-bd
2013-01-17 15:47:55 +04:00
Vokhmin Alexey V
318007751c
#839 : enable new_core for all platforms
2013-01-17 14:46:51 +04:00
Vokhmin Alexey V
097ffacf61
#794 : merge master into branch
2013-01-16 19:07:39 +04:00
Alexander Machehin
b256422aff
[refs #818 ] add list to index collection
2013-01-15 18:50:28 +06:00
Alexander Machehin
88ab5a9a4f
[refs #818 ] more clean authorization
2013-01-15 18:16:12 +06:00
Alexander Machehin
182a90af4a
[refs #818 ] refactoring part4
2013-01-11 16:03:24 +06:00
Alexander Machehin
ba026c948d
[refs #818 ] refactoring part 3
2013-01-10 22:43:36 +06:00
Alexander Machehin
abf83a563d
[refs #818 ] small refactoring part2
2013-01-10 21:50:49 +06:00
Alexander Machehin
5d6e8f6c3a
[refs #818 ] small refactoring
2013-01-10 20:50:12 +06:00
Alexander Machehin
9384e08c08
[refs #818 ] fix mistake
2012-12-29 22:22:21 +06:00
Alexander Machehin
70903249ce
[refs #818 ] small ui changes
2012-12-29 18:38:14 +06:00
Alexander Machehin
1e878f0775
[refs #818 ] working with system users
2012-12-29 01:24:41 +06:00
Alexander Machehin
6fc5eaa65c
[refs #818 ] add system role
2012-12-28 00:27:50 +06:00
Vokhmin Alexey V
f0b9d23bc2
Merge branch 'master' into 794-move-all-keys-into-abf-bd
2012-12-25 18:24:01 +04:00
Vladimir Sharshov
4b5e6f8395
Merge pull request #804 from warpc/fix-autocomplete_projects
...
[refs #808 ] fix RegexpError: premature end of char-class
2012-12-25 05:45:14 -08:00
Alexander Machehin
7d58b89366
add a new core option to mass_builds
2012-12-25 18:15:20 +06:00
Alexander Machehin
43d1c29d46
fix RegexpError: premature end of char-class
2012-12-25 15:46:07 +06:00
Alexander Machehin
71672826b2
again fix ActiveRecord::UnknownAttributeError: unknown attribute: build_requires
2012-12-25 09:09:26 +06:00
Alexander Machehin
0cb10fa581
fix ActiveRecord::UnknownAttributeError: unknown attribute: build_requires
2012-12-24 23:19:38 +06:00
Vokhmin Alexey V
9b8a55db42
#794 : merge master into the branch
2012-12-24 18:07:09 +04:00
Vokhmin Alexey V
ac762388a4
#800 : enable "new_core" for personal platforms
2012-12-24 16:35:29 +04:00
Vokhmin Alexey V
da4860bc45
#794 : add #key_pair action, add new specs
2012-12-20 23:46:16 +04:00
Vokhmin Alexey V
d19f96abce
#778 : send packages for cleanup on publishing
2012-12-18 17:18:54 +04:00
Vokhmin Alexey V
6f623dbab5
#785 : udd user to ProductBuildList, and etc changes
2012-12-14 19:14:33 +04:00
Alexander Machehin
21bf3627b4
[refs #762 ] optimize action
2012-12-11 20:33:08 +06:00
Alexander Machehin
a452df79b8
[refs #762 ] refactoring
2012-12-11 19:48:16 +06:00
Alexander Machehin
60986b7a18
[refs #762 ] refactoring
2012-12-11 01:35:56 +06:00
Alexander Machehin
ea542de6f1
[refs #762 ] change ui
2012-12-11 00:02:34 +06:00
Vladimir Sharshov
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
Vokhmin Alexey V
eae2b2ce02
#759 : add state_machine into the ProductBuildList
2012-12-06 23:18:28 +04:00
Vokhmin Alexey V
e3e228de33
#759 : add tester role for user
2012-12-06 22:04:39 +04:00
Alexander Machehin
dc1525b85e
[refs #762 ] add mass build from list
2012-12-06 23:59:17 +06:00
Vokhmin Alexey V
ab8c4016b5
#759 : refactoring according to Vladimir's comments
2012-12-06 21:34:09 +04:00
Vokhmin Alexey V
ff2ae73985
#759 : add action for cancel build, some refactoring
2012-12-06 18:41:24 +04:00
Alexander Machehin
0a88010a83
fix pagination
2012-12-04 17:12:51 +06:00
Alexander Machehin
ef860ed737
fix invalid value for Integer()
2012-12-04 16:18:36 +06:00
Alexander Machehin
3432b6af49
[refs #674 ] change comments
2012-12-04 00:06:31 +06:00
Alexander Machehin
b132a56937
Merge branch 'master' into 674-diff_between_commits
...
Conflicts:
db/schema.rb fresh
2012-12-04 00:02:45 +06:00
Vokhmin Alexey V
d325838b1f
Merge branch 'master' into 735-package-build-server
2012-12-03 15:38:03 +04:00
Vokhmin Alexey V
ee73df5d3a
disable auto_publish for new_core, some refactoring
2012-12-03 15:28:27 +04:00
Alexander Machehin
611402c4c2
[refs #674 ] add stats
2012-12-03 17:11:55 +06:00
Vladimir Sharshov
ec57f0ba9a
Merge pull request #738 from warpc/732-maintainer-db-api
...
[refs #732 ] add maintainers api
2012-11-30 09:33:21 -08:00
Alexander Machehin
bfa538e644
[refs #732 ] small refactoring
2012-11-30 23:15:37 +06:00
Vokhmin Alexey V
fcdbfd4538
add new column to build_lists table, some refactoring
2012-11-30 14:41:39 +04:00
Vokhmin Alexey V
a5daff3442
update getting logs, some repo generation
2012-11-29 21:56:03 +04:00
Alexander Machehin
364e5d9b67
[refs #736 ] add to api build lists of the project
2012-11-29 23:52:15 +06:00
Vokhmin Alexey V
791f77dfd5
add 'New core' option for creating build_list
2012-11-29 19:12:24 +04:00
vladdruzh
5899d5f28f
add filters to maintainers list api
2012-11-29 09:32:10 +04:00
Alexander Machehin
efd2945508
[refs #733 ] change error message
2012-11-28 21:29:34 +06:00
Alexander Machehin
b8e6903faa
[refs #733 ] small refactoring
2012-11-28 20:52:11 +06:00
Alexander Machehin
663db6e7ff
[refs #733 ] add check for correct answer
2012-11-28 20:43:38 +06:00
vladdruzh
0545863642
refactor
2012-11-28 10:04:40 +04:00
Alexander Machehin
8ed71e0f03
[refs #674 ] fixed undefined method 'binary?' for nil:NilClass when rename the file
2012-11-27 23:35:58 +06:00
Vokhmin Alexey V
96e8df1b50
use Redis for getting log
2012-11-26 22:16:34 +04:00
vladdruzh
c42fcc824a
add to api maintainers index method
2012-11-26 15:32:23 +04:00
Vokhmin Alexey V
af2be3fb09
create logical model for serach by ABF
2012-11-21 19:04:41 +04:00
Vokhmin Alexey V
c629c91bb7
rename constants
2012-11-21 16:55:57 +04:00
Vokhmin Alexey V
6b842bb51a
add Search API, some refactoring
2012-11-21 16:09:01 +04:00
Alexander Machehin
7be2df7578
[refs #674 ] first step of the diff between commits
2012-11-20 01:15:15 +06:00
Vladimir Sharshov
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
Alexander Machehin
95d262b92f
fix build list pagination
2012-11-14 23:56:00 +06:00
Vladimir Sharshov
34bb256ff1
Merge pull request #715 from warpc/iso-worker
...
[refs #711 ] Integration Iso worker
2012-11-14 03:14:28 -08:00
Alexander Machehin
8df87ed292
[refs #90 ] fixed error on create
2012-11-14 16:51:10 +06:00
Alexander Machehin
9c0ae23927
small refactoring
2012-11-13 20:29:59 +06:00
Alexander Machehin
21a32fba6c
show expected message after add member error
2012-11-13 20:29:45 +06:00
Vokhmin Alexey V
abbbacdf7f
update ability.rb, add new specs
2012-11-13 15:11:33 +04:00
Vokhmin Alexey V
21d8a42072
merge master into the branch
2012-11-12 20:52:33 +04:00
Vokhmin Alexey V
51aff682d4
some refactoring according to Alexander's comments
2012-11-12 20:23:11 +04:00
Vokhmin Alexey V
259eeaecfc
add Stop action and time_living for building ISO
2012-11-12 17:22:19 +04:00
Vokhmin Alexey V
8f9cd0ff8a
updated logger on build product page
2012-11-09 21:42:25 +04:00
Alexander Machehin
26af1aa27c
Merge branch 'master' into 90-fix_orphan_pulls
...
Conflicts:
app/models/pull_request.rb
2012-11-09 20:53:55 +06:00
Vokhmin Alexey V
b39ccea0d5
add show logs in real time
2012-11-09 17:08:56 +04:00
Vokhmin Alexey V
eb40fbbbd5
removed unnecessary fields for build ISO
2012-11-07 16:14:31 +04:00
Vokhmin Alexey V
6a7035d551
added #show action for product_build_list
2012-11-06 22:01:54 +04:00
Vokhmin Alexey V
e39ca302d7
#new action for build ISO - done.
2012-11-06 21:17:44 +04:00
Vokhmin Alexey V
b1722cae75
added some params for build ISO
2012-11-06 20:19:52 +04:00
Vokhmin Alexey V
317f672e32
added #new action for create ISO build
2012-11-06 19:08:54 +04:00
Vokhmin Alexey V
ecec330b4d
added migration, updated models, UI
2012-11-06 18:13:16 +04:00
Alexander Machehin
58a9c68951
[refs #90 ] fixed rendering a new pull
2012-10-28 00:44:42 +06:00
Alexander Machehin
95e5804358
[refs #90 ] fixed git timeout error on the big diff
2012-10-26 20:03:46 +06:00
Alexander Machehin
ba74024b29
fixed order of the handle exceptions
2012-10-25 15:42:47 +06:00
Vokhmin Alexey V
05f16c1d13
#709 : updated controller and view for fixing undefined local variable or method 'project_counter'
2012-10-22 12:26:00 +04:00
Vladimir Sharshov
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
Vokhmin Alexey V
25620af00c
hot fix for specs
2012-10-19 19:35:19 +04:00
Vokhmin Alexey V
e9fd2a2df6
Merge branch 'master' into 706-get-list-of-projects-by-repository
2012-10-19 18:51:11 +04:00
Vokhmin Alexey V
ba968cc5a0
#706 : updated Ability model, Repositories controller, added specs
2012-10-19 18:49:01 +04:00
Vladimir Sharshov
00e92d9672
Merge pull request #678 from warpc/579-code_line_comments
...
[refs #579 ] code line comments
2012-10-19 07:48:50 -07:00
Vokhmin Alexey V
18ac16ae96
#698 : small refactoring, added ckeck for main platform
2012-10-19 18:03:09 +04:00
Vokhmin Alexey V
b9f1835d1c
Merge branch 'master' into 698-rest-api-for-advisories
2012-10-19 17:58:38 +04:00
Vokhmin Alexey V
4680e9c62c
#706 : added #projects action to Repositories API
2012-10-19 17:52:36 +04:00
Alexander Machehin
6c8c1ca880
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-10-19 18:47:26 +06:00
Vokhmin Alexey V
d563c9a9f9
#702 : added handling errors
2012-10-19 15:47:49 +04:00
Vokhmin Alexey V
0cf0933074
#698:small refactoring
2012-10-19 11:32:12 +04:00
Vokhmin Alexey V
5cf69bff92
#698 : renamed method
2012-10-18 20:36:29 +04:00
Vokhmin Alexey V
8bbb82faa8
#698 : updated Advisories API
2012-10-18 20:25:24 +04:00
Vokhmin Alexey V
84e5f3ead3
#698 : updated specs, permission access
2012-10-18 19:44:28 +04:00
Vokhmin Alexey V
d5ad5b1a95
Merge branch 'master' into 698-rest-api-for-advisories
2012-10-18 18:59:00 +04:00
Vokhmin Alexey V
a3252594b8
#698 : fixed #index action in Advisories controller
2012-10-18 18:32:43 +04:00
Vokhmin Alexey V
68dbae8c83
#698 : added #create and #fork actions for Advisories API
2012-10-18 18:17:50 +04:00
Alexander Machehin
c6f45956cc
[refs #90 ] fixed error by 24fd99b2d5cab
2012-10-18 18:50:43 +06:00
Alexander Machehin
e15bf13c4f
[refs #90 ] small refactoring of the diff method
2012-10-18 18:09:12 +06:00
Alexander Machehin
62ca030110
[refs #90 ] head_branch -> from_branch
2012-10-18 17:46:57 +06:00
Vokhmin Alexey V
b7eff22c23
#698 : added API for Advisories
2012-10-18 15:22:31 +04:00
Vokhmin Alexey V
97590f06a0
#686 : added specs for projects API
2012-10-17 21:08:21 +04:00
Vokhmin Alexey V
6680265c64
#686 : some refactoring of relations
2012-10-17 17:46:16 +04:00
Vokhmin Alexey V
2d067a45ca
#686 : added members action for project API
2012-10-17 16:18:52 +04:00
Vokhmin Alexey V
351821912b
#686 : added API for show list of projects
2012-10-17 14:35:33 +04:00
Vokhmin Alexey V
f0caf6a9f9
#692 : updated groups/profile_controller
2012-10-16 20:38:49 +04:00
Vokhmin Alexey V
e5af275c3a
#692 : small refactoring according to Alexander's comments
2012-10-16 20:36:59 +04:00
Vokhmin Alexey V
432e219571
#692 : some refactoring
2012-10-16 17:42:52 +04:00
Alexander Machehin
f060d919d9
[refs #579 ] add new helper
2012-10-16 19:20:55 +06:00
Vokhmin Alexey V
df105efd56
#692 : added #update_member action for Groups API
2012-10-16 17:03:18 +04:00
Vokhmin Alexey V
5795e1cea5
#692 : updated API
2012-10-16 16:35:30 +04:00
Vokhmin Alexey V
d99a2104ce
#692:added index action for Groups API
2012-10-16 15:49:07 +04:00
Alexander Machehin
9579734506
[refs #579 ] some optimization by getting pull repo
2012-10-16 16:19:53 +06:00
Alexander Machehin
b0604f89d1
[refs #579 ] move logick to model
2012-10-16 15:50:21 +06:00
Vokhmin Alexey V
888cbe445e
#691 : small refactoring
2012-10-15 22:30:06 +04:00
Alexander Machehin
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
Vokhmin Alexey V
6aef7cfb30
#691 : revert base controller
2012-10-15 19:49:52 +04:00
Vokhmin Alexey V
f3605a1211
#691 : updated routes according to Vladimir's comments
2012-10-15 19:47:42 +04:00
Vokhmin Alexey V
5aa5bbc0b8
#691 : small refactoring
2012-10-15 18:50:58 +04:00
Vokhmin Alexey V
84b49052b1
#691 : added specs for Users API
2012-10-15 18:43:09 +04:00
Vokhmin Alexey V
0879a7e46f
#691 : added #notifiers and #update actions for Users API
2012-10-15 18:06:08 +04:00
Vokhmin Alexey V
2ae671df21
Merge branch 'master' into 691-rest-api-for-users
2012-10-15 17:03:05 +04:00
Vokhmin Alexey V
9087a15627
#672 : small refactoring Api::V1::BaseController#member method
2012-10-15 14:07:10 +04:00
Vokhmin Alexey V
5d9a1e2586
#672 : removed API helper
2012-10-15 13:48:25 +04:00
Vokhmin Alexey V
e50bd3a2b5
#691 : added #show action for Users API
2012-10-15 13:45:00 +04:00
Vokhmin Alexey V
5c88ac6f3e
#672 : updated Repositories#signatures API action, added specs
2012-10-14 18:44:10 +04:00
Vokhmin Alexey V
00f5d0ce62
#672 : updated Repositories API
2012-10-14 17:38:06 +04:00
Vokhmin Alexey V
146f72c062
#672 : small refactoring
2012-10-14 16:39:58 +04:00
Vokhmin Alexey V
be8ed0984a
#672 : added #add_member, #remove_member, #update, #destroy actipns for Repository API
2012-10-14 16:00:49 +04:00
Alexander Machehin
b9d69a966b
[refs #579 ] add 404 for wrong commit hash
2012-10-13 01:59:14 +06:00
Alexander Machehin
c5d6707b8f
[refs #579 ] fixed commit comments errors
2012-10-13 01:57:54 +06:00
Vladimir Sharshov
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
Alexander Machehin
993454fc29
[refs #579 ] alpha version of the pull discussion
2012-10-11 23:50:40 +06:00
Vokhmin Alexey V
8f3ed58cd8
#671 : added Projects#refs_list API action
2012-10-11 20:27:17 +04:00
Alexander Machehin
7f031ac688
[refs #374 ] added commit validation
2012-10-11 22:11:53 +06:00
Vokhmin Alexey V
6b3bf41c7a
#671 : removed before_filter
2012-10-11 19:36:14 +04:00
Vokhmin Alexey V
992892f2c8
#671 : small refactoring
2012-10-11 19:18:54 +04:00
Alexander Machehin
e379a603b4
[refs #90 ] get new pull to this project
2012-10-11 00:59:25 +06:00
Vokhmin Alexey V
05d222e9de
#671 : updated output errors
2012-10-10 21:51:00 +04:00
Vokhmin Alexey V
eef640e82c
#671 : added API Platforms#create action, updated specs, added validation to platform model
2012-10-10 21:45:56 +04:00
Vokhmin Alexey V
919459617a
#671 : small refactoring
2012-10-10 20:31:22 +04:00
Vokhmin Alexey V
0841c4d705
added 400 error for API BuildLists#create action
2012-10-10 20:19:00 +04:00
Vokhmin Alexey V
972877bc76
#671 : added API Platforms#destroy action and specs
2012-10-10 19:43:14 +04:00
Vokhmin Alexey V
d9c583e226
#671 : added specs for API Platforms#clone action
2012-10-10 19:13:14 +04:00
Vokhmin Alexey V
e6bb63db08
#671 : removed restrict_paginate method
2012-10-10 16:02:59 +04:00
Vokhmin Alexey V
e5c6707594
#671 : added #remove_member action for platforms API, updated specs
2012-10-09 21:07:10 +04:00
Vokhmin Alexey V
30909b281d
#671 : added #add_member action for platforms API, added new specs
2012-10-09 20:23:48 +04:00
Vokhmin Alexey V
9e6e2de955
#671 : added #members action for platforms API
2012-10-09 19:06:27 +04:00
Vokhmin Alexey V
abe31b3c2e
#671 : added API #update action for platform
2012-10-09 18:46:20 +04:00
Alexander Machehin
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
Vokhmin Alexey V
feefe8ed89
#374 : added #platforms_for_build action for Platforms API
2012-10-08 22:02:44 +04:00
Alexander Machehin
a5477926bc
[refs #579 ] fix checking path
2012-10-08 21:36:46 +06:00
Alexander Machehin
fcfdf1b26b
[refs #579 ] change 'base' & 'head' -> 'to' & 'from'
2012-10-08 21:36:23 +06:00
Alexander Machehin
70e8a1fe0d
[refs #579 ] unless -> if
2012-10-08 21:33:43 +06:00
Alexander Machehin
21b7b0d0b1
[refs #579 ] dont create wrong comment
2012-10-08 21:31:30 +06:00
Alexander Machehin
3241b7a55a
[refs #579 ] save additional info for pull inline comments
2012-10-08 20:54:36 +06:00
Alexander Machehin
824ee79452
[refs #579 ] redirect to created comment
2012-10-08 15:20:45 +06:00
Alexander Machehin
ed7aec602f
[refs #579 ] alpha version of the pull inline comments
2012-10-06 01:19:05 +06:00
Alexander Machehin
49946f4f53
[refs #90 ] fix creating a blocked pull
2012-10-05 23:31:06 +06:00
Alexander Machehin
80a91b21a9
[refs #579 ] fixed bug with new_line access
2012-10-05 18:32:56 +06:00
Alexander Machehin
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
Alexander Machehin
527dd210bf
[refs #579 ] alpha version of inline comments for commit
2012-10-05 00:40:12 +06:00
Vokhmin Alexey V
f5d0d9f20b
#671 : added filter platforms by type
2012-10-04 17:34:30 +04:00
Vokhmin Alexey V
df0251282d
#671 : updated API arches controller, added specs
2012-10-04 17:13:55 +04:00
Vokhmin Alexey V
4b72501159
#671 : added Architectures API
2012-10-04 16:45:49 +04:00
Vladimir Sharshov
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
Vokhmin Alexey V
ad50934bab
#624 : fixed downloading RAW files
2012-10-04 01:20:07 +04:00
Vladimir Sharshov
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
Vokhmin Alexey V
33209e7200
hotfix for downloading 'tar' archives
2012-10-04 00:27:13 +04:00
Vokhmin Alexey V
04b2647ef0
#668 : added uploading avatars for groups
2012-10-03 20:38:42 +04:00
Alexander Machehin
bf7bc8787a
[refs #90 ] small controller refactoring
2012-10-03 17:59:18 +06:00
Alexander Machehin
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
Alexander Machehin
1d424b463c
[refs #90 ] fix when creating new pull
2012-10-03 09:21:16 +06:00
Vladimir Sharshov
d2c338e4e4
Merge pull request #665 from warpc/90-ui
...
[refs #90 ] pull request ui + fixes
2012-10-02 10:41:06 -07:00
Vokhmin Alexey V
cb994c6fd6
#349 : created autocompletes_controller, refactoring, updated specs
2012-10-02 20:54:55 +04:00
Alexander Machehin
b3fd95d7fa
[refs #90 ] always redirect to pull on update action
2012-10-02 21:27:15 +06:00
Alexander Machehin
53b421d8e5
[refs #90 ] fixed pull ability for project writers & changing tests
2012-10-02 21:19:50 +06:00
Vokhmin Alexey V
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
Vokhmin Alexey V
ffe38b0a08
#349 : updated Users::ProfileController and Groups::ProfileController
2012-10-02 16:04:26 +04:00
Alexander Machehin
35c965a796
[refs #90 ] add all ancestors to base project choise
2012-10-02 15:20:48 +06:00
Alexander Machehin
d948949532
[refs #90 ] new pull optimization
2012-10-02 15:14:31 +06:00
Alexander Machehin
f92f209323
[refs #90 ] fixed changing base project
2012-10-01 23:43:15 +06:00
Alexander Machehin
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
Alexander Machehin
90069b2fb6
[#refs #90 ] fix pull flashes
2012-09-28 23:45:27 +06:00
Alexander Machehin
fbc537174e
[refs #90 ] search base project by fullname
2012-09-28 21:39:45 +06:00
Alexander Machehin
abafbc6ef5
Merge again-and-again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-09-28 00:09:34 +06:00
Alexander Machehin
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
Vladimir Sharshov
a20e1552cc
[refs #374 ] Fix test, small refactoring.
2012-09-27 16:13:59 +04:00
Vladimir Sharshov
0dd103b7f4
[refs #374 ] Fix build list tests, remove unused code.
2012-09-27 03:54:56 +04:00
Vladimir Sharshov
77b57cce11
[refs #374 ] Fix support http basic auth, fix tests, fix abilities.
2012-09-26 21:15:11 +04:00
Alexander Machehin
a994e7dd74
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 23:10:45 +06:00
Alexander Machehin
4100b875bd
[refs #90 ] fixed access
2012-09-26 23:10:04 +06:00
Alexander Machehin
cc05fa695a
[refs #90 ] fixed pull abilities part 2
2012-09-26 23:09:29 +06:00
Vokhmin Alexey V
37fbb4632e
#90 : updated branch
2012-09-26 21:04:12 +04:00
Vokhmin Alexey V
613db04375
#90 : added limit for commits into the pull request
2012-09-26 21:00:58 +04:00
Vokhmin Alexey V
6f889b15a9
#90 : added access to show pull requests
2012-09-26 19:39:47 +04:00
Vokhmin Alexey V
37c9a906c4
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
2012-09-26 18:45:26 +04:00
Vokhmin Alexey V
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
Vokhmin Alexey V
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
Alexander Machehin
dbf1a5f8ca
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 15:27:54 +06:00
Alexander Machehin
3491492c8d
[refs #90 ] fixed pull authorization
2012-09-26 15:24:46 +06:00
Vokhmin Alexey V
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +04:00
Vokhmin Alexey V
0299c069c6
#90 : style changes for header, increase performanse for #autocomplete_base_project action
2012-09-25 19:18:22 +04:00
Alexander Machehin
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
Vladimir Sharshov
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
Vladimir Sharshov
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
Vokhmin Alexey V
84378afc3d
#648 : small code optimization
2012-09-25 13:36:50 +04:00
Vokhmin Alexey V
768f4b1dfb
#648 : renamed parametr
2012-09-24 22:07:53 +04:00
Vokhmin Alexey V
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
Alexander Machehin
2c6d4bae9e
[refs #616 ] add error messages to ajax
2012-09-24 23:34:14 +06:00
Alexander Machehin
f4bbeaaa46
[refs #616 ] fixed 500 when failed to create comment
2012-09-24 23:01:04 +06:00
Vokhmin Alexey V
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
konstantin.grabar
7812adfdbc
[refs #374 ] Add custom http basic auth for api
2012-09-21 23:15:56 +04:00
Vokhmin Alexey V
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
konstantin.grabar
5bcebcf384
[refs #374 ] Add publish_without_qa field, fix some specs, update docs for auth
2012-09-21 18:30:40 +04:00
konstantin.grabar
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
Vokhmin Alexey V
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
Vokhmin Alexey V
07f5224e76
#385 : removed before_filter
2012-09-20 15:21:54 +04:00
Vokhmin Alexey V
c76618441e
#385 : revert some changes according to discussion
2012-09-20 15:10:52 +04:00
Vokhmin Alexey V
9d2c9ae2b3
#385 : added rsa to name of archives for git branches
2012-09-20 00:38:40 +04:00
Vokhmin Alexey V
f39adfd2f7
#385 : fixed specs, updated controller, view
2012-09-19 23:29:36 +04:00
Alexander Machehin
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +06:00
Alexander Machehin
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06:00
Alexander Machehin
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
Vokhmin Alexey V
fe20814b5a
#633 : hot fix
2012-09-13 20:18:09 +04:00
Vokhmin Alexey V
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +04:00
Vladimir Sharshov
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
Vokhmin Alexey V
1c9a9e803e
#638 : some refactoring
2012-09-13 00:47:39 +04:00
Vokhmin Alexey V
1a75a5a394
#638 : updated Relation model, repositories and platforms controllers according to comments
2012-09-12 23:32:51 +04:00
Vladimir Sharshov
e3bcd2382e
[refs #641 ] Show only public projects in group profile
2012-09-12 18:49:40 +04:00
Vokhmin Alexey V
3b622f54b9
#638 : added before_filter to repositories_controller
2012-09-12 17:43:02 +04:00
Vokhmin Alexey V
bc4043e558
#638 : hot fix
2012-09-12 17:25:46 +04:00
Vokhmin Alexey V
b468b09529
#638 : some refactoring for adding new user
2012-09-12 17:07:34 +04:00
Vokhmin Alexey V
1e40b9fb06
#638 : some refactoring
2012-09-12 00:08:25 +04:00
Vokhmin Alexey V
3858bfa6b7
#638 : added members to repository model, updated views
2012-09-11 19:30:14 +04:00
Vokhmin Alexey V
5f941844f2
#637 : added migration, updated approve_notification
2012-09-10 15:08:53 +04:00
Pavel Chipiga
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
Vladimir Sharshov
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
Vladimir Sharshov
71e28cf3f3
Merge branch 'master' into 349-anonymous_access
2012-09-07 00:31:28 +04:00
Vladimir Sharshov
2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
Vladimir Sharshov
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
Vokhmin Alexey V
c1d87a36da
#631 : fixed misprint in model and controller
2012-09-06 19:43:07 +04:00
Vokhmin Alexey V
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
Vokhmin Alexey V
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
Vokhmin Alexey V
f0f11cb9dc
#631 : added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
2012-09-06 17:43:50 +04:00