Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,238 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

565 Commits

Author SHA1 Message Date
Vokhmin Alexey V 87f7aff544 #251: updated structure of json response 2013-08-03 14:47:23 +04:00
Alexander Machehin b8954471a9 [#242] refactoring controller 2013-08-03 09:58:45 +06:00
Vokhmin Alexey V 057fc3a675 #251: added pagination 2013-08-02 22:13:41 +04:00
Vokhmin Alexey V 39ccf5c91d #251: added groups to build_lists 2013-08-02 18:04:16 +04:00
Vokhmin Alexey V c8d094fbf7 #251: small refactoring of BuildList controller 2013-08-02 02:42:20 +04:00
Vokhmin Alexey V b3ab16ec09 #251: use AJAX for load data on BuildList#index page 2013-08-02 02:24:33 +04:00
Alexander Machehin f416bd9071 [#242] use datatable 2013-08-01 23:18:46 +06:00
Alexander Machehin 3f757a11c5 [#247] small refactoring build lists controller 2013-07-31 21:15:31 +06:00
Alexander Machehin 029273328c small refactoring build lists controller 2013-07-31 21:10:00 +06:00
Alexander Machehin eb184a8156 [#242] create build list from existing 2013-07-31 20:57:02 +06:00
Alexander Machehin 2362d7073d [#242] add ability to recreate build list 2013-07-30 17:31:54 +06:00
Vokhmin Alexey V a098e00a1a Merge branch 'master' into 226-remove-API-calls-from-JS 
Conflicts:
	app/assets/javascripts/angularjs/controllers/project_refs_controller.js
	config/routes.rb
 2013-07-23 19:23:20 +04:00
Vokhmin Alexey V 2a5d72550b Merge branch 'master' into 222-create-new-branch-on-web 2013-07-23 17:41:50 +04:00
Vokhmin Alexey V c9b7f890fa #222: removed #restore_branch method 2013-07-23 17:29:41 +04:00
Vokhmin Alexey V 157becb196 #226: removed API calls from JS 2013-07-23 16:29:35 +04:00
Vokhmin Alexey V eb4d4806f4 #226: updated Branches and Tags views, JS, etc. 2013-07-23 14:07:39 +04:00
Alexander Machehin 854f324627 redirect from issue to pull request and vice versa 2013-07-22 22:54:59 +06:00
Vokhmin Alexey V 079f8a955a #222: init GitHook on creating branch from UI 2013-07-22 18:21:12 +04:00
Vokhmin Alexey V 6f67b580c4 #222: added form for creating new branch 2013-07-22 15:27:14 +04:00
Vokhmin Alexey V 1fb472d416 #214: refactoring of Tree#destroy action according to Alexander's comments 2013-07-19 14:22:29 +04:00
Vokhmin Alexey V 7880fa4625 #214: added specs for Project #restore_branch && #delete_branch 2013-07-15 17:52:13 +04:00
Vokhmin Alexey V 2b423e6a6e #214: some refactoring of JS, added comments 2013-07-15 16:09:31 +04:00
Vokhmin Alexey V c79fbbd2d5 Merge branch 'master' into 214-delete-and-restore-branches 2013-07-13 00:31:52 +04:00
Vokhmin Alexey V a8f4648a08 #214: added skip_authorize_resource for TreeController 2013-07-13 00:30:02 +04:00
Vokhmin Alexey V fe8e1216c5 #214: remove unnecessary code 2013-07-12 23:27:49 +04:00
Vokhmin Alexey V ffcdd26c66 #214: updated UI of PullRequest#show 2013-07-12 18:21:46 +04:00
avokhmin 332168bf5e Merge pull request #216 from abf/rosa-build:fix_activity_for_pull_requests 
fix dublication messages after creation pull request
 2013-07-11 19:35:31 +04:00
Vokhmin Alexey V e096fc1bde #214: updated logic of deleting of branch 2013-07-11 17:50:22 +04:00
Vokhmin Alexey V 2e33f0038a #214: added ability to destroy branch 2013-07-11 17:03:02 +04:00
Vokhmin Alexey V ddbaffdb13 #214: removed unnecessary code 2013-07-11 14:37:02 +04:00
Vokhmin Alexey V d747ffd070 #214: updated #branches page, integrated AngularJS 2013-07-11 14:34:44 +04:00
Alexander Machehin 38ced2c998 [#200] fix dublication messages & activity after creating pull request 2013-07-10 01:55:43 +06:00
Vokhmin Alexey V f370645eed #211: added specs for BuildList controller, updated ability.rb 2013-07-04 23:55:56 +04:00
Vokhmin Alexey V 5652f2b6d3 #211: display only platforms for which user has access on read 2013-07-04 22:25:07 +04:00
Vokhmin Alexey V 1cd1ac45a1 #81: sort projects list alphabetically when no search 2013-07-01 14:50:35 +04:00
Alexander Machehin 8e189821bd remove extra pull check 2013-06-24 21:18:52 +06:00
Alexander Machehin 926c4d604d [#105] restore deleted code in error 2013-06-21 19:49:12 +06:00
Alexander Machehin 20056fbc31 many issue/pull fixes 2013-06-19 02:00:01 +06:00
warpc 9a24a636bc Merge pull request #174 from abf/rosa-build:173-undefined-method-render_as 
[refs #173]: NoMethodError: undefined method "render_as"
 2013-06-10 23:57:11 +04:00
Vokhmin Alexey V 9f80f662a5 #173: redirect to #tree_path when blob is tree 2013-06-10 20:44:57 +04:00
Alexander Machehin 28b12b8c96 [#135] add publish & reject publish action 2013-06-10 17:26:12 +06:00
Alexander Machehin 1db7955e0c Merge branch 'master' into 135-reject_build_lists 
Conflicts:
	spec/controllers/api/v1/build_lists_controller_spec.rb
	spec/controllers/projects/build_lists_controller_spec.rb
 2013-06-09 20:28:22 +06:00
Vokhmin Alexey V f3bcf89ab6 #156: removed unnecessary code 2013-06-05 00:06:56 +04:00
Vokhmin Alexey V 237bd6affb #156: update UI of MassBuild#new BuildList#new 2013-06-04 23:59:08 +04:00
Alexander Machehin b9a8464307 [#135] set rejector in api & small controllers refactoring 2013-05-30 16:41:09 +06:00
warpc 0df589c101 Merge pull request #144 from abf/rosa-build:114-change-ui-for-ability-to-attach-at-assembly-additional-packages 
[refs #114]: Change UI for ability to attach at assembly additional sources of packages
 2013-05-30 14:32:58 +04:00
Alexander Machehin afd24a65f5 [#135] set user who reject publication as publisher in build list 2013-05-30 15:54:07 +06:00
Vokhmin Alexey V 352d2ae027 #34: enable webhooks for all 2013-05-29 17:05:00 +04:00
Vokhmin Alexey V a26aac8463 #114: Split extra repos and build_lists into 2 elements 2013-05-27 22:13:00 +04:00
warpc 0da9bfef74 Merge pull request #103 from abf/rosa-build:34-webhook 
[refs #34]: Webhook
 2013-05-17 18:39:27 +04:00
Vokhmin Alexey V 6cf7a2e21d #34: added access rights to Hooks only for global admins 2013-05-17 00:07:40 +04:00
Vokhmin Alexey V 8319fe8e9b #133: attach only personal repositories to the build 2013-05-16 18:48:44 +04:00
Vokhmin Alexey V 9f73359cca #34: removed unnecessary comments 2013-05-16 15:36:29 +04:00
Vokhmin Alexey V 8a7e2c83a7 #34: some refactoring of HooksController 2013-05-16 13:52:55 +04:00
warpc d092a355a3 Merge pull request #128 from abf/rosa-build:98-common_tracker 
[refs #98] common tracker for issues and pull requests
 2013-05-16 12:29:14 +04:00
Vokhmin Alexey V 0b4e7f63fe Merge branch 'master' into 34-webhook 2013-05-14 13:46:31 +04:00
Alexander Machehin 8c7a4937c0 [#125] fix checking ability to create project for group 2013-05-08 20:41:15 +06:00
Alexander Machehin f588ec36f5 [#125] Add ability to create/fork project in group also for members with "write" access 2013-05-07 20:56:13 +06:00
Alexander Machehin d3ac9d1a2c [#98] Add common issues tracker 2013-04-30 00:14:25 +06:00
Vokhmin Alexey V 4c96629a28 #34: merge master into branch 2013-04-25 15:36:00 +04:00
Vokhmin Alexey V 015679b047 #73: merge master into branch 2013-04-23 17:21:10 +04:00
Vokhmin Alexey V 26c7a5a711 #34: added specs for Hooks controller 2013-04-15 15:47:53 +04:00
Vokhmin Alexey V 5dca2e914d #34: update ability.rb 2013-04-15 14:30:48 +04:00
Vokhmin Alexey V 03396ea606 #34: update messages, comments 2013-04-15 13:40:41 +04:00
Vokhmin Alexey V 4414479650 #34: update UI 2013-04-15 13:25:40 +04:00
Vokhmin Alexey V 9e286bb5a2 #34: update controller, views, model of Hook 2013-04-14 19:46:56 +04:00
Vokhmin Alexey V d28a2b0173 #34: added Hook model, controller, views 2013-04-12 17:26:18 +04:00
Vokhmin Alexey V 9b851001f8 Merge branch 'master' into 82-extend-abilities-of-personal-platforms 2013-04-09 15:15:09 +04:00
Vokhmin Alexey V 38ce6115c2 #73: merge master into branch 2013-04-08 22:55:21 +04:00
Vokhmin Alexey V 958017b3ed #82: update for adding new packages into repository 2013-04-08 18:27:50 +04:00
warpc 1a9ff66f26 Merge pull request #66 from abf/rosa-build:19-gfm 
[#19] add members/issues/pull requests/emoji references
 2013-04-08 15:33:44 +04:00
Alexander Machehin 914a2967c3 Merge branch 'master' into 19-gfm 
Conflicts:
	app/views/projects/issues/_issue.html.haml
 2013-04-08 17:04:59 +06:00
Vokhmin Alexey V 179615f5b7 #73: create #by_owner_and_name scope 2013-04-04 17:33:11 +04:00
Vokhmin Alexey V 110499360b #73: small refactoring 2013-04-04 01:18:56 +04:00
Vokhmin Alexey V 9dcd08b868 #73: add owner_uname into Project 2013-04-04 01:06:13 +04:00
Vokhmin Alexey V 62ff6312b4 #73: Increatse performance for #autocomplete_to_project action 2013-04-03 20:03:52 +04:00
Vokhmin Alexey V 9e7eb7af94 #29: merge master into branch 2013-04-03 16:10:22 +04:00
Vokhmin Alexey V a33e20c5e4 #51: add new specs for Issue 2013-04-03 15:11:50 +04:00
Vokhmin Alexey V 6585c3a92b #51: move logic to controller 2013-04-03 13:59:34 +04:00
Vokhmin Alexey V 8b6a0eab0f #51: some refactoring 2013-04-03 01:59:33 +04:00
Vokhmin Alexey V 2bc580500d #51: Change rights for operations with tags and assignee 2013-04-03 01:23:00 +04:00
Vokhmin Alexey V 05a8cec169 #53: added Publisher into BuildList 2013-03-28 15:58:26 +04:00
Alexander Machehin 70e37925c6 Merge branch 'master' into 19-attach_issue_to_issue 
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
 2013-03-28 00:19:59 +06:00
Alexander Machehin 8290b412fc [#19] removed old code 2013-03-22 23:31:12 +06:00
Alexander Machehin ce2ca6646e [#19] add issue references from commit 2013-03-22 22:50:13 +06:00
Vokhmin Alexey V 8e21159314 #37: some styles changes 2013-03-22 01:20:36 +04:00
Vokhmin Alexey V c3a9246d09 #37: fix for assignee User to PullRequest 2013-03-21 00:46:33 +04:00
Vokhmin Alexey V 5239be2827 #37: update filter by "Accessory" for PullRequests 2013-03-20 19:22:13 +04:00
Vokhmin Alexey V f6ec81bb35 #37: update UI for "Assignee" Issues and PullRequests 2013-03-20 19:06:25 +04:00
Vokhmin Alexey V a92df70c5e #26: update 'font-size' for issue-title, increase count of issues on page 2013-03-20 01:30:35 +04:00
Vokhmin Alexey V ccccc3f082 #26: update 'Comment' model according to Vladimir's comments 2013-03-19 21:05:55 +04:00
Vokhmin Alexey V 2c56283fba #26: fixed search by substring 2013-03-19 19:30:50 +04:00
Vokhmin Alexey V 568ea50ac1 #26: move #touch_issue method into Comment model 2013-03-19 16:40:54 +04:00
Vokhmin Alexey V 32062f75c7 #26: touch Issue#updated_at field when comment has been changed (created/updated/destroyed) 2013-03-19 16:32:17 +04:00
Vokhmin Alexey V f8fb48a85b #26: remove unnecessary stiles, JS, update PullRequests controller 2013-03-19 16:11:02 +04:00
Vokhmin Alexey V f4381b61c6 #26: update table on issues page with Ajax 2013-03-19 15:57:01 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Alexander Machehin 6c00085c84 change default base branch on create pull request 2013-03-07 18:22:48 +06:00
Vladimir Sharshov bbc699cb6d Merge pull request #947 from warpc/757-enable-extra-containers-for-main-platforms 
[refs #757]: Enable extra containers for main platforms
 2013-02-25 07:43:28 -08:00
Alexander Machehin ab703ffa4f #959 fix did you run git update-server-info on the server? 2013-02-25 20:35:39 +06:00
Vladimir Sharshov 96abcad5ce Merge pull request #950 from warpc/944-fix_branch_errors 
[refs #944] disable selecting tag on branches page, new way to check empty project and fix undefined method `name' for nil:NilClass
 2013-02-22 03:24:48 -08:00
Vokhmin Alexey V 7a2b547d2b #757: rename #extra_containers to #extra_build_lists 2013-02-22 15:04:14 +04:00
Vokhmin Alexey V 79d81e9c13 #757: add logic for enable/disable "auto_create_container" field on UI, some refactoring 2013-02-22 14:20:47 +04:00
Vokhmin Alexey V 38b6375ca3 #757: send error when some containers for main platform have not been published 2013-02-22 13:09:37 +04:00
Alexander Machehin 836a030438 fixing errors with wrong branch (again) #944 2013-02-22 14:54:04 +06:00
Alexander Machehin e08c31e314 #944 refactoring checking empty project 2013-02-22 13:22:34 +06:00
Alexander Machehin 71de1477b3 #944 fix check empty repository 2013-02-22 13:17:00 +06:00
Vokhmin Alexey V 3e9c28e238 #757: merge master into branch 2013-02-22 02:17:20 +04:00
Vladimir Sharshov 7a8dcc1b10 Merge pull request #948 from warpc/944-fix_branch_errors 
[refs #944] Fix branch errors: 
- empty project;
- show branches pages when active tag selection.
 2013-02-21 12:01:46 -08:00
Alexander Machehin 750131ae74 #944 show no branches on empty project 2013-02-22 01:59:02 +06:00
Alexander Machehin e9dec9192f #944 fix error with branches list 2013-02-22 01:24:20 +06:00
Alexander Machehin 2ba37b5da4 #944 fix showing empty project 2013-02-22 01:23:45 +06:00
Vokhmin Alexey V 28f539f0b4 #757: update BuildList validation 2013-02-21 18:46:52 +04:00
Vokhmin Alexey V 219ef67699 #757: add filter by save_to_platform_id in #autocomplete method 2013-02-21 18:28:54 +04:00
Vokhmin Alexey V 46a5b8daad #757: enable extra containers and repositories for main platforms 2013-02-21 18:21:58 +04:00
Alexander Machehin 3902a78e37 #921 refactoring per page 2013-02-21 18:46:28 +06:00
Alexander Machehin 3dda72a0ac Merge branch 'master' into 921-task-monitoring 
Conflicts:
	app/assets/javascripts/extra/build_list.js
 2013-02-21 00:54:04 +06:00
Alexander Machehin e5db61197e [refs #921] add new filter to the build list monitoring 2013-02-20 21:07:11 +06:00
Vokhmin Alexey V 65b98a2d00 #757: update name of methods, API 2013-02-19 19:22:38 +04:00
Vokhmin Alexey V c4113c11fb #757: add checking ability with "accessible_by" 2013-02-19 18:52:02 +04:00
Vokhmin Alexey V 5234b7cc51 #757: create "published_container" scope 2013-02-19 18:14:51 +04:00
Vokhmin Alexey V 61e9d24bb5 #757: add validation for new fields 2013-02-19 12:31:01 +04:00
Vokhmin Alexey V e9fa6e860d #757: update #autocomplete_to_extra method 2013-02-18 21:04:22 +04:00
Vokhmin Alexey V 9ecd26885b #757: find build_list with container 2013-02-18 20:53:54 +04:00
Vokhmin Alexey V 4604ceb318 #757: some refactoring of styles 2013-02-18 20:10:34 +04:00
Vokhmin Alexey V 20691dabc5 #757: add migration, update UI, JS 2013-02-18 19:43:30 +04:00
Vladimir Sharshov 0c28ddb5b5 Merge pull request #930 from warpc/907-save-project-tags-on-file-store 
[refs #907]: save project tags archives on file store
 2013-02-15 05:01:39 -08:00
Vokhmin Alexey V befbf7e85a #899: hot fix 2013-02-15 16:00:34 +04:00
Vokhmin Alexey V 69d384412e #899: update #init_statistics method, refactoring 2013-02-15 15:57:00 +04:00
Vokhmin Alexey V 0c6cc8afc8 #899: small refactoring 2013-02-15 15:16:34 +04:00
Vokhmin Alexey V 7bcbe39e61 #907: update "FileStoreClean" module, some refactoring 2013-02-15 01:49:18 +04:00
Vokhmin Alexey V c6aa58c063 Merge branch 'master' into 907-save-project-tags-on-file-store 2013-02-14 17:15:16 +04:00
Vokhmin Alexey V 5c286a6aa0 #907: add ProjectTags table, update UI, logic 2013-02-14 16:46:25 +04:00
Alexander Machehin 934cb8fbb8 [refs #907] fixed 404 in branch with dots 2013-02-14 12:55:56 +06:00
Vokhmin Alexey V 7fc8e33993 #907: small refactoring of UI 2013-02-13 23:29:08 +04:00
Vokhmin Alexey V 58ac925368 #907: refactoring #tags && #branches views 2013-02-13 21:40:16 +04:00
Vokhmin Alexey V 2a3fb08a89 #907: "skip_before_filter authenticate_user!" for #tags and #branche 2013-02-13 15:42:24 +04:00
Vokhmin Alexey V f97fb4c4a5 #907: show only tags with commit 2013-02-13 15:38:25 +04:00
Vokhmin Alexey V c762d2b6e0 #907: update #tags action 2013-02-13 15:23:58 +04:00
Vokhmin Alexey V 3929c4bb57 #907: update #branches UI 2013-02-13 14:25:09 +04:00
Vokhmin Alexey V 77d3a01614 #907: add #branches, #tags actions 2013-02-12 20:35:14 +04:00
Vladimir Sharshov f3033caac4 Merge pull request #879 from warpc/878-fix_bugs_with_git_without_master 
[refs #878] Fix varios errors with missing default git branch what set in project settings.
 2013-02-01 05:53:46 -08:00
Alexander Machehin 7185a46ed7 [refs #878] fixed ActionController::RoutingError (Not Found) for archives 2013-01-31 23:26:41 +06:00
Alexander Machehin 8860238da4 [refs #878] fix some bugs when no master branch 2013-01-31 22:26:49 +06:00
Vokhmin Alexey V 3fab64813e #859: update specs, API for build_list 2013-01-31 00:04:19 +04:00
Vokhmin Alexey V fed1c76ca2 #860: update logic for creating build list container 2013-01-28 18:44:06 +04:00
Vokhmin Alexey V f4c3d23d7c create container for BuildList 2013-01-25 21:24:46 +04:00
Vladimir Sharshov bf445d9e5e Merge pull request #850 from warpc/848-add-status-information-for-product-build-lists 
[refs #848]: add status information about servers for ProductBuildLists
 2013-01-25 03:37:41 -08:00
Vokhmin Alexey V b46c1e963f #848: update StatusInspector, UI 2013-01-24 14:42:03 +04:00
Alexander Machehin 1873f9cd49 [refs #847] remove core callbacks 2013-01-24 15:41:18 +06:00
Alexander Machehin 0d9c095cbd [refs #847] remove old core code 2013-01-24 12:33:16 +06:00
Vokhmin Alexey V 86034c5da4 #843: update pages for using only new_core 2013-01-21 19:52:20 +04:00
Vokhmin Alexey V 318007751c #839: enable new_core for all platforms 2013-01-17 14:46:51 +04:00
Alexander Machehin 43d1c29d46 fix RegexpError: premature end of char-class 2012-12-25 15:46:07 +06:00
Vokhmin Alexey V ac762388a4 #800: enable "new_core" for personal platforms 2012-12-24 16:35:29 +04:00
Vokhmin Alexey V e3e228de33 #759: add tester role for user 2012-12-06 22:04:39 +04: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 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 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
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
Vokhmin Alexey V 791f77dfd5 add 'New core' option for creating build_list 2012-11-29 19:12:24 +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
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +06:00
Alexander Machehin 95d262b92f fix build list pagination 2012-11-14 23:56:00 +06:00
Alexander Machehin 8df87ed292 [refs #90] fixed error on create 2012-11-14 16:51:10 +06: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
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
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 0cf0933074 #698:small refactoring 2012-10-19 11:32:12 +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
Alexander Machehin f060d919d9 [refs #579] add new helper 2012-10-16 19:20:55 +06: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 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 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
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Alexander Machehin 7f031ac688 [refs #374] added commit validation 2012-10-11 22:11:53 +06:00
Alexander Machehin e379a603b4 [refs #90] get new pull to this project 2012-10-11 00:59:25 +06: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
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 ad50934bab #624: fixed downloading RAW files 2012-10-04 01:20:07 +04:00
Vokhmin Alexey V 33209e7200 hotfix for downloading 'tar' archives 2012-10-04 00:27:13 +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
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
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 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
Vokhmin Alexey V 2406423483 #648: added filters to Projects page 2012-09-21 21:57:22 +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
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 2c1df5cd14 Merge branch 'master' into 263-refactoring 
Conflicts:
	config/deploy.rb
	db/schema.rb
 2012-09-06 21:14:14 +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