Commit Graph

2791 Commits

Author SHA1 Message Date
Vokhmin Alexey V 3dc1cb8124 Merge branch 'master' into 778-file-system-workers 2012-12-18 14:34:12 +04:00
Vokhmin Alexey V d155242f33 #778: pass "released" status of platform to resque job 2012-12-17 21:17:18 +04:00
Vokhmin Alexey V e3314a724f #778: pass "save_results" option to resque job 2012-12-17 20:13:24 +04:00
Alexander Machehin b9ef0f7c5d Merge branch 'master' into 777-group_owner 2012-12-17 21:17:50 +06:00
Vokhmin Alexey V f90bd06fb3 #778: separate "binary" and "source" packages 2012-12-17 19:14:52 +04:00
Vokhmin Alexey V 514dcbe994 #778: some refactoring and fixes 2012-12-17 19:03:52 +04:00
Vokhmin Alexey V eaa26db89a #778: remove unnecessary code 2012-12-17 18:50:09 +04:00
Vokhmin Alexey V c159146048 #778: add #destroy_project_from_repository method 2012-12-17 18:39:02 +04:00
Alexander Machehin 12b8b4c612 [refs #782] fix error with base auth 2012-12-17 20:18:18 +06:00
Alexander Machehin f9d680857d [refs #782] fix undefined method access_locked? for nil:NilClass 2012-12-17 19:12:12 +06:00
Vokhmin Alexey V 8757724acc #778: update rails gem, update destroy Platform and Reposytory 2012-12-17 16:28:17 +04:00
Vokhmin Alexey V 1bae7d2293 Merge branch 'master' into 778-file-system-workers 2012-12-17 13:29:49 +04:00
Alexander Machehin 333bbf7cf6 [refs #787] fixed inline commit comments 2012-12-15 11:17:11 +06:00
Vladimir Sharshov fc4bd690a8 Merge pull request #783 from warpc/782-url_to_closed_project
[refs #782] support user hash token auth in git; add base auth to git url sending to build system
2012-12-14 10:09:47 -08:00
Vokhmin Alexey V 9bc560e8aa #778: misprint 2012-12-14 21:36:35 +04:00
Vokhmin Alexey V de7665c8ca #778: revert some changes after merge 753-remove-xml-rpc 2012-12-14 21:33:43 +04:00
Vokhmin Alexey V 8e63d78f77 #778: merge master and 753-remove-xml-rpc into branch 2012-12-14 21:19:23 +04:00
Alexander Machehin 01389ba90d [refs #785] add authorization to archive path 2012-12-14 21:41:22 +06:00
Vokhmin Alexey V b250aba86e #785: small UI changes 2012-12-14 19:18:29 +04:00
Vokhmin Alexey V 6f623dbab5 #785: udd user to ProductBuildList, and etc changes 2012-12-14 19:14:33 +04:00
Alexander Machehin 2f1a21cbdf [refs #782] restore login&pass authentication 2012-12-14 19:20:46 +06:00
Alexander Machehin 2bb5d517a2 [refs #782] add base auth to git url 2012-12-14 17:25:10 +06:00
Vokhmin Alexey V 7528b05715 #778: some refactoring, fix specs 2012-12-13 23:14:18 +04:00
Alexander Machehin 519886fecd [refs #777] fix for group owned project 2012-12-14 00:18:22 +06:00
Vokhmin Alexey V 07d0ed89b4 #778: integrate FileSystemWorker with Platforms and Repositories 2012-12-13 21:38:04 +04:00
Vokhmin Alexey V 1509910a1f #778: add file_system_worker for repositories and platforms 2012-12-13 20:13:13 +04:00
Vladimir Sharshov aa2cddb0bf Merge pull request #771 from warpc/755-publish-build-list-container
[refs #755]: Publish build list container, refactoring, add personal repo in the list of repositories to connect during assembly in the personal platform
2012-12-13 04:36:37 -08:00
Vokhmin Alexey V 4e1aa466fd #755: small refactoring 2012-12-13 16:30:37 +04:00
Vokhmin Alexey V 1bebdb34db #755: add personal repository for creating BuildList 2012-12-13 16:24:29 +04:00
Alexander Machehin 4aebe1e695 Merge pull request #775 from warpc/774-fix-undefined-method-error
#774: fix NoMethodError
2012-12-12 09:46:34 -08:00
Vokhmin Alexey V cdcce3ad43 #755: update path to all repositories 2012-12-12 18:06:46 +04:00
Alexander Machehin 4ae3a24e33 add ideas to bottom menu 2012-12-12 18:50:23 +06:00
Vokhmin Alexey V 71717311d1 Merge branch 'master' into 755-publish-build-list-container 2012-12-12 16:47:25 +04:00
Vokhmin Alexey V 4fd44e587c #774: fix NoMethodError 2012-12-12 16:41:11 +04:00
Vokhmin Alexey V e245c4e86f #755: update time_live of worker 2012-12-12 16:34:33 +04:00
Alexander Machehin 6fbad4c2ac [refs #762] moved missing projects to statuses column 2012-12-12 17:25:30 +06:00
Alexander Machehin c6272d4a34 [refs #762] fix js fill 2012-12-12 17:05:02 +06:00
Alexander Machehin 819e2a7992 [refs #762] remove old code 2012-12-12 16:21:11 +06:00
Vladimir Sharshov 59c1d75a36 Merge pull request #772 from warpc/762-ui_and_refactoring
[refs #762] ui and refactoring for mass build; fix syntax highlight
2012-12-11 14:19:56 -08:00
Vokhmin Alexey V 3b8524bd28 #755: small fix 2012-12-11 18:47:57 +04:00
Alexander Machehin 60ce85269e [refs #762] optimize build_for method 2012-12-11 20:35:36 +06:00
Alexander Machehin 21bf3627b4 [refs #762] optimize action 2012-12-11 20:33:08 +06:00
Alexander Machehin fdce6eb325 [refs #762] move js code to assets 2012-12-11 20:03:55 +06:00
Alexander Machehin a452df79b8 [refs #762] refactoring 2012-12-11 19:48:16 +06:00
Alexander Machehin 80921e4237 [refs #762] remove collapse 2012-12-11 18:09:44 +06:00
Vokhmin Alexey V 6526106d9e #755: enable "publish" button on #show page 2012-12-11 16:06:41 +04:00
Vokhmin Alexey V 1c51a2d514 #755: update path to platform for personal platforms, some refactoring 2012-12-11 15:47:32 +04:00
Alexander Machehin 60986b7a18 [refs #762] refactoring 2012-12-11 01:35:56 +06:00
Vokhmin Alexey V b62414ec1d #755: update BuildList#publish_container 2012-12-10 22:04:33 +04:00
Alexander Machehin ea542de6f1 [refs #762] change ui 2012-12-11 00:02:34 +06:00
Vokhmin Alexey V 0fe74f17ac #755: merge master into the branch 2012-12-10 21:05:25 +04:00
Vokhmin Alexey V 62a761a7c9 #766: add filter to /build_lists page 2012-12-10 16:15:22 +04: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 6a99d56489 #759: add comments, some refactoring according to Vladimir's comments 2012-12-07 15:47:42 +04:00
Vokhmin Alexey V a8e1cea057 #759: save sec of time_living instead of minut, some fixes of state_machine 2012-12-07 15:11:12 +04:00
Vokhmin Alexey V f8cbae424e #759: update #build_canceled event 2012-12-07 13:10:38 +04:00
Vladimir Sharshov 31461eeadf [refs #762] Fix searching platform package, fix repository selecting. 2012-12-07 02:28:51 +04:00
Vladimir Sharshov 632a007e2d Add missing params for build_from_list operations 2012-12-07 01:21:05 +04:00
Alexander Machehin b91489c886 [refs #762] fix many errors 2012-12-07 02:12:48 +06:00
Vokhmin Alexey V 4d3fe773cd #759: update time_living for tasks 2012-12-06 23:57:20 +04:00
Vokhmin Alexey V 8eabfc975a #759: add comment 2012-12-06 23:45:35 +04:00
Vokhmin Alexey V eae2b2ce02 #759: add state_machine into the ProductBuildList 2012-12-06 23:18:28 +04:00
Vladimir Sharshov 9a43c1b3ec Merge pull request #764 from warpc/762-list_build
[refs #762] add mass build from list
2012-12-06 10:49:14 -08:00
Alexander Machehin 26f7cd31fb [refs #762] remove label 2012-12-07 00:46:56 +06: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 c3e8d18925 #759: remove #xml_rpc_create method 2012-12-06 21:10:23 +04:00
Vokhmin Alexey V ef8ece3e87 #759: update status for BuildList::Item, fix getting logs 2012-12-06 20:28:44 +04:00
Vokhmin Alexey V 60f2ab3d96 #759: some fixes 2012-12-06 20:00:24 +04:00
Vladimir Sharshov a9e94e1433 Merge pull request #754 from warpc/751-move-link-to-file-store-into-app-config
[refs #751]: add url to file-store into the application.yml
2012-12-06 07:08:31 -08:00
Vokhmin Alexey V ff2ae73985 #759: add action for cancel build, some refactoring 2012-12-06 18:41:24 +04:00
Alexander Machehin 97196c5484 [refs #758] fix error on fork 2012-12-06 18:35:05 +06:00
Vokhmin Alexey V 1f74b25522 #755: add workers for publishing build_lists 2012-12-06 14:11:51 +04:00
Alexander Machehin 18e53bd5b8 [refs #753] change git-repo HEAD 2012-12-06 13:26:31 +06:00
Alexander Machehin bdc2cd78fb [refs #758] add default branch validation 2012-12-06 13:18:16 +06:00
Vokhmin Alexey V d0179d03b6 #751: add url to file-store into the application.yml 2012-12-05 14:56:59 +04:00
Vokhmin Alexey V 128b4104f1 #751: update link to version of BuildList::Item 2012-12-04 20:13:55 +04:00
Vokhmin Alexey V 5defd009d3 #751: show link to diff in "Items" section 2012-12-04 19:48:30 +04:00
Vokhmin Alexey V b4472a1403 #751: open logs of (Product)BuildList in new window 2012-12-04 19:20:59 +04:00
Vladimir Sharshov 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
Alexander Machehin 0a88010a83 fix pagination 2012-12-04 17:12:51 +06:00
Alexander Machehin bd25c4aa3d [refs #674] add last published commit to api 2012-12-04 16:40:05 +06:00
Alexander Machehin 51bf88c892 [refs #674] rename column 2012-12-04 16:24:28 +06:00
Alexander Machehin ef860ed737 fix invalid value for Integer() 2012-12-04 16:18:36 +06:00
Alexander Machehin 9e5a7e3fdb [refs #674] fix get last published commit 2012-12-04 15:59:16 +06:00
Alexander Machehin 42e76f5fa6 [refs #674] fix undefined method 'last_published_commit_hash' for product build list 2012-12-04 09:33:04 +06:00
Alexander Machehin 5019d27b50 [refs #674] small helper refactoring 2012-12-04 00:09:36 +06:00
Alexander Machehin 3432b6af49 [refs #674] change comments 2012-12-04 00:06:31 +06:00
Alexander Machehin bff88e86e3 [refs #674] small diff message for build lists 2012-12-04 00:04:03 +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
Alexander Machehin ec6279d803 [refs #674] add diff to build lists 2012-12-03 23:43:24 +06:00
Vokhmin Alexey V 3ef841184c fill packages of BuildList when use new_core 2012-12-03 21:17:20 +04:00
Alexander Machehin 0669fb2789 [refs #674] small changes 2012-12-03 22:52:11 +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 46d465536f some refactoring, add comments 2012-11-30 17:10:17 +04:00
Vokhmin Alexey V ace1312095 hot fix 2012-11-30 15:34:08 +04:00
Vokhmin Alexey V 1af7b7525f remove some comments 2012-11-30 15:19:55 +04:00
Vokhmin Alexey V bc1ab2f8aa show results-table only for BuildList with new_core 2012-11-30 14:55:14 +04: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 b468f0655f some refactoring of #log method 2012-11-29 23:42:54 +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 8ca41377fc [refs #736] add git url 2012-11-28 23:25:28 +06: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
Alexander Machehin 76606036cb [refs #737] remove branch from commit message 2012-11-28 19:15:15 +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 3d6269da9b add results column to build_lists table 2012-11-27 18:22:17 +04:00
Vokhmin Alexey V c7adea14ce fix the tasks duplication 2012-11-27 14:59:47 +04:00
Vokhmin Alexey V 96e8df1b50 use Redis for getting log 2012-11-26 22:16:34 +04:00
Vokhmin Alexey V c7ea2f7656 send task to abf-worker 2012-11-26 22:00:29 +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 7fcd3d6780 update url for search results 2012-11-21 17:49:34 +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
Vokhmin Alexey V 6fe07d83d6 add validation for build_for_platform field 2012-11-20 20:14:51 +04:00
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +06:00
Vokhmin Alexey V b7b0ea2f7a remove #check_status method 2012-11-19 22:08:02 +04:00
Vokhmin Alexey V 2f0f49d674 hot fix 2012-11-19 20:39:57 +04:00
Vokhmin Alexey V 894f8651d9 rename BUILD_IN_QUEUE to BUILD_PENDING 2012-11-19 20:38:08 +04:00
Vokhmin Alexey V 223cf774f6 revert path to data 2012-11-19 19:48:14 +04:00
Vokhmin Alexey V 846aedf49d add canceling status 2012-11-19 19:41:59 +04:00
Vokhmin Alexey V 75596c3e2d revert path to data 2012-11-19 19:19:05 +04:00
Vokhmin Alexey V ebbf47f818 show file size, and in_queue status for ProductBuildList 2012-11-19 19:11:07 +04: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 50ce84bfa9 remove old activity feeds 2012-11-15 00:10:03 +06:00
Alexander Machehin 95d262b92f fix build list pagination 2012-11-14 23:56:00 +06:00
Alexander Machehin 56e9174045 [refs #90] avoid collisions with temporary repos 2012-11-14 22:28:21 +06:00
Alexander Machehin 1afcef17c3 [refs #90] clean dir before clone 2012-11-14 21:46:59 +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 8ad53f4c0b [refs #90] create a "new" pull at another dir 2012-11-14 16:52:26 +06:00
Alexander Machehin 8df87ed292 [refs #90] fixed error on create 2012-11-14 16:51:10 +06:00
Vokhmin Alexey V 38c7aa3008 updated view 2012-11-13 19:55:10 +04: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 f522fd3cd0 add selecting Arch on create product build 2012-11-13 18:01:06 +04:00
Vokhmin Alexey V abbbacdf7f update ability.rb, add new specs 2012-11-13 15:11:33 +04:00
Vokhmin Alexey V 57ec1e2982 update specs for Products and ProductBuildLists 2012-11-13 14:31:45 +04:00
Vokhmin Alexey V cb488a35d1 refactoring of model, update factory 2012-11-13 13:27:39 +04:00
Vokhmin Alexey V 21d8a42072 merge master into the branch 2012-11-12 20:52:33 +04:00
Vokhmin Alexey V 7ac93584ad small refactoring of views 2012-11-12 20:49:04 +04:00
Vokhmin Alexey V 45ed0c0d51 small refactoring 2012-11-12 20:41:12 +04:00
Vokhmin Alexey V 51aff682d4 some refactoring according to Alexander's comments 2012-11-12 20:23:11 +04:00
Vokhmin Alexey V 577b8d6af8 Add comment for ProductBuildList#stop 2012-11-12 20:05:34 +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 d2871afaff revert changes 2012-11-12 13:41:41 +04:00
Vokhmin Alexey V 8032437585 remove crontab 2012-11-09 21:56:39 +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 ef967e97ae small style changes 2012-11-09 17:51:33 +04:00
Vokhmin Alexey V 1db2115fb0 add function for update page page automatically 2012-11-09 17:31:35 +04:00
Vokhmin Alexey V b39ccea0d5 add show logs in real time 2012-11-09 17:08:56 +04:00
Vokhmin Alexey V 3d293b908d added IsoWorkerObserver 2012-11-09 01:39:42 +04:00
Vokhmin Alexey V 4595ce349c Merge branch 'master' into iso-worker 2012-11-08 18:17:35 +04:00
Vokhmin Alexey V 34f1026728 add fake url for project 2012-11-08 17:04:02 +04:00
Vokhmin Alexey V fc3dbbf698 added help for creating ISO 2012-11-08 15:11:44 +04:00
Vladimir Sharshov 08b3099b90 Send http(s) git url instead NFS path 2012-11-08 13:41:07 +04:00
Alexander Machehin e9233d362a add new git_path param 2012-11-08 15:13:48 +06:00
Vokhmin Alexey V 9d7de35ec4 start ISO worker 2012-11-07 18:32:46 +04:00
Vokhmin Alexey V f21926f7f5 extra style changes 2012-11-07 17:21:08 +04:00
Vokhmin Alexey V eb40fbbbd5 removed unnecessary fields for build ISO 2012-11-07 16:14:31 +04:00
Alexander Machehin e9ac67de5f Fix validations for groups, platforms, projects, repositories,
users
2012-11-07 16:25:43 +06:00
Alexander Machehin 36ac66303a fixed user uname validation 2012-11-07 15:30:34 +06: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 970da230f2 [refs #90] add validations 2012-10-29 21:33:20 +06:00
Alexander Machehin 36e07b440f [refs #90] set data to pull 2012-10-28 00:46:04 +06:00
Alexander Machehin 217a92b443 [refs #90] fix pull header 2012-10-28 00:45:24 +06:00
Alexander Machehin 58a9c68951 [refs #90] fixed rendering a new pull 2012-10-28 00:44:42 +06:00
Alexander Machehin c6a0dfee97 [refs #90] fixed orphan pulls 2012-10-28 00:04:28 +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 4f2d75ea40 #709: removed unnecessary template 2012-10-22 13:16:58 +04: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 ec6621a5ec #706: small refactoring Advisories#show API view 2012-10-19 18:56:29 +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 f67a8b3692 #706: some refactoring, updated build_list API response 2012-10-19 18:24:28 +04: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
Alexander Machehin 9bc9eab4f1 [refs #579] remove new comment form after close & fix focus 2012-10-19 18:39:11 +06:00
Julea Pikareva eda6ea4691 [refs #704] Fix height button "Clear" 2012-10-19 16:38:01 +04:00
Julea Pikareva 9c62029f6d [refs #619] Fix long title in the activity feed
not observant
2012-10-19 16:07:19 +04:00
Vladimir Sharshov 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
Julea Pikareva 81c80b42e8 [refs #619] Fix long title in activity feed 2012-10-19 15:54:32 +04:00
Vokhmin Alexey V d563c9a9f9 #702: added handling errors 2012-10-19 15:47:49 +04:00
Julea Pikareva ef77f16fac [refs #619] Fix end-of-line format 2012-10-19 14:38:38 +04:00
Julea Pikareva ad27738ce9 [refs #619] Fix radio-button in Opera 2012-10-19 14:27:14 +04:00
Alexander Machehin 54f462f408 [refs #579] small refactoring 2012-10-19 15:50:15 +06:00
Vokhmin Alexey V 0cf0933074 #698:small refactoring 2012-10-19 11:32:12 +04:00
Alexander Machehin ea1ec80d29 [refs #579] fixed bug with updating comments 2012-10-18 23:37:52 +06: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 334fc9a574 #698: revert advisory model 2012-10-18 18:29:31 +04:00
Vokhmin Alexey V 68dbae8c83 #698: added #create and #fork actions for Advisories API 2012-10-18 18:17:50 +04:00
Vokhmin Alexey V 00a8858348 #698: updated Advisories#show API 2012-10-18 17:08:40 +04:00
Alexander Machehin ecf8e7e5ee [refs #579] fixed wiki & refactoring 2012-10-18 18:51:28 +06: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
Alexander Machehin 7870ffef7d [refs #579] fixed some bugs 2012-10-18 00:38:42 +06: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 a89380c4e2 #686:small refactoring 2012-10-17 16:46:19 +04:00
Vokhmin Alexey V 4e075ac121 #686: created owner partial, small refactoring 2012-10-17 16:35:56 +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 c36ae5413b #692: added specs for Group API 2012-10-16 18:44:21 +04:00
Vokhmin Alexey V 432e219571 #692: some refactoring 2012-10-16 17:42:52 +04:00
Alexander Machehin 3868fbf4f3 [refs #579] forgot change to the pull.repo 2012-10-16 19:22:19 +06:00
Alexander Machehin b2fd348351 [refs #579] fixed bug with saving around lines 2012-10-16 19:21:47 +06: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 7327d195c4 #692:added show action for Groups API 2012-10-16 15:51:14 +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
Alexander Machehin a807a22230 [refs #579] remove debug code 2012-10-16 14:07:26 +06:00
Vladimir Sharshov 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
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
Alexander Machehin 5c7fb21511 [refs #579] add cursor pointer to arrow 2012-10-16 00:16:01 +06:00
Alexander Machehin cef112efc3 [refs #579] first version of the outdated diff 2012-10-16 00:14:43 +06:00
Alexander Machehin 8d4311e419 [refs #579] remove a wrong line 2012-10-15 23:46:44 +06:00
Alexander Machehin 66f0cc3244 [refs #579] fixed setting status to inline comments 2012-10-15 23:45:01 +06:00