Commit Graph

1362 Commits

Author SHA1 Message Date
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 df56f518b3 Merge branch 'master' into 30-social-login-and-open-registration 2013-04-04 15:51:13 +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 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
warpc 0a2c88e071 Merge pull request #64 from abf/rosa-build:53-information-about-user-who-published-build-list
#53: Save and show information about user who published build list
2013-04-02 18:29:34 +04:00
Vokhmin Alexey V c5c54013f3 #53: set publisher on MassBuilds#publish action 2013-04-02 17:54:18 +04:00
Vokhmin Alexey V c9b04a6acc #53: some refactoring according to discussion 2013-04-02 15:04:51 +04:00
Vokhmin Alexey V 1fd4ea4da7 #55: added anonymous access for mass_builds page 2013-04-01 14:52:12 +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
Vokhmin Alexey V 79c178357e #31: UI: update #project_version field on change project 2013-03-27 17:36:01 +04:00
avm b6ea7c4cf0 Merge pull request #50 from abf/rosa-build:31-autostart-ISO-builds-on-a-regular-basis
#31: Autostart ISO builds on a regular basis (on the anvil)
2013-03-26 22:38:51 +04:00
Vokhmin Alexey V 960aecb6d5 #30: refactoring of OmniauthCallbacksController#find_for_ouath 2013-03-26 17:35:02 +04:00
Vokhmin Alexey V 69c226be0b #30: update comments, some refactoring 2013-03-26 17:30:43 +04:00
Vokhmin Alexey V cd98088e7f #30: find user by email before registration 2013-03-26 17:22:25 +04:00
Vokhmin Alexey V abfe502b5f #30: update devise.rb and omniauth_callbacks_controller 2013-03-26 16:24:15 +04:00
Vokhmin Alexey V c2e89f8781 #30: use omniauth for registration through Facebook, GitHub, Google 2013-03-26 03:13:15 +04:00
Vokhmin Alexey V 79f428f6d2 #37: merge master into branch 2013-03-25 19:16:06 +04:00
Vokhmin Alexey V 9670f72ef9 #31: added specs for ProductBuildList#update action 2013-03-25 19:04:05 +04:00
Vokhmin Alexey V d0c22b8c4b #31: merge master into branch 2013-03-22 22:59:06 +04:00
Vokhmin Alexey V 820fdcfa85 #31: add #update action to ProductBuildList API, print new fields in API 2013-03-22 22:56:32 +04: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 3865332e8a #31: add UI for save product_build_list 2013-03-22 20:04:29 +04:00
Vokhmin Alexey V 8e21159314 #37: some styles changes 2013-03-22 01:20:36 +04:00
Vokhmin Alexey V cff502bf48 #40: added ability to publish build lists of mass build. 2013-03-21 18:41:45 +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 f15be4b92a #23: return json response at RoutingError 2013-03-15 17:35:32 +04:00
avm e33138a118 Merge pull request #2 from abf/rosa-build:1-update-access-rights-for-admins-of-platform\r\n #1: Update access rights for admins of platform 2013-03-07 17:16:27 +04:00
Alexander Machehin 6c00085c84 change default base branch on create pull request 2013-03-07 18:22:48 +06:00
Vokhmin Alexey V 9de37b852e #1: rename #update_secondary to #local_admin_manage 2013-03-07 14:05:53 +04:00
Vokhmin Alexey V 22e60281f8 Merge branch 'master' into 1-update-access-rights-for-admins-of-platform 2013-03-07 13:49:41 +04:00
Alexander Machehin d85039d5be Support git over ssh: hooks, support gitlab-shell api, UI, refactroing 2013-03-07 14:09:08 +06:00
Vokhmin Alexey V be9ada74cb #1: fix for specs, update ability for Platform 2013-03-07 02:47:30 +04:00
Vokhmin Alexey V 98891a9153 #1: fix for specs, update ability.rb 2013-03-07 02:39:44 +04:00
Alexander Machehin 8756a6d28a fix mistype 2013-03-01 17:33:31 +06:00
Alexander Machehin c065e3d5be #953 add key management 2013-03-01 17:33:02 +06:00
Alexander Machehin 520d51a55a #953 ssh keys initial 2013-02-28 23:02:14 +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 78dbd1cf5d Merge pull request #936 from warpc/926-update-routes-for-product-build-list
[refs #926]: Support short url for product build list
2013-02-15 07:39:42 -08:00
Vokhmin Alexey V ff6ff1189c #926: rename method 2013-02-15 19:16:09 +04:00
Vokhmin Alexey V ae5328d19a #926: small refactoring 2013-02-15 19:07:40 +04:00
Vokhmin Alexey V 56b47715e6 #926: redirect to #show page when platform_id or product_id doesn't exist 2013-02-15 18:22:57 +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
Vladimir Sharshov 7e165b8ba4 Merge pull request #924 from warpc/907-project-tags-page
[refs #907]: project tags and branchs pages, new look of projects submenu in main project page.
2013-02-13 10:50:21 -08:00
Vokhmin Alexey V 58ac925368 #907: refactoring #tags && #branches views 2013-02-13 21:40:16 +04:00
Vladimir Sharshov 11f95f1271 Merge pull request #916 from warpc/893-regenerate_metadata
[refs #893] Ability manually regenerate metadata in repository of main platform;
2013-02-13 08:01:38 -08: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
Alexander Machehin 1a3db04817 [refs #893] small refactoring 2013-02-13 15:32:28 +06:00
Vokhmin Alexey V 77d3a01614 #907: add #branches, #tags actions 2013-02-12 20:35:14 +04:00
Alexander Machehin 9dfdfc5a04 [refs #893] add check & flash messages 2013-02-12 19:30:28 +06:00
Alexander Machehin 677195b116 [refs #893] some fixes from comments 2013-02-12 16:52:40 +06:00
Alexander Machehin 9ff869f167 [refs #893] fix button && action 2013-02-11 23:32:31 +06:00
Alexander Machehin ac69547805 [refs #893] add regenerate metadata for repository 2013-02-11 21:24:17 +06:00
Alexander Machehin bb99c60689 [refs #861] remove update code 2013-02-08 01:27:38 +06:00
Alexander Machehin f43b7303c1 [refs #861] fixed creating product build list 2013-02-08 00:36:57 +06:00
Alexander Machehin 18d61b4915 [refs #861] add product build lists api 2013-02-07 01:05:49 +06:00
Vladimir Sharshov eb53c1ab5e Merge pull request #885 from warpc/861-products_api
[refs #861] Add products api
2013-02-05 00:56:53 -08:00
Vokhmin Alexey V c8ae6053af Merge branch 'master' into 880-add-publish-again-option-for-build-list 2013-02-04 17:48:34 +04:00
Vokhmin Alexey V c24373f6eb #880: remove unnecessary methods 2013-02-02 13:27:40 +04:00
Vokhmin Alexey V 2fa96551aa #880: remove unnecessary code, update specs 2013-02-01 21:25:42 +04:00
Alexander Machehin 36b258d2a0 [refs #861] move products list to platform 2013-02-01 21:52:41 +06:00
Alexander Machehin 94401d4494 [refs #861] add products api 2013-02-01 21:05:12 +06: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 1cabd9cea8 #859: some refactoring according to Alexander's comments 2013-01-31 15:32:01 +04:00
Vokhmin Alexey V b8b03b62b0 #859: small refactoring 2013-01-31 00:51:05 +04:00
Vokhmin Alexey V 67284a95c2 #859: add specs for #create_container 2013-01-31 00:42:37 +04:00
Vokhmin Alexey V 3fab64813e #859: update specs, API for build_list 2013-01-31 00:04:19 +04:00
Vokhmin Alexey V 2a1a15eb03 #859: update BuildList API 2013-01-30 20:23:50 +04:00
Vokhmin Alexey V ad08a31e5f #860: merge master into branch 2013-01-29 23:23:52 +04:00
Vokhmin Alexey V 2af919014d remove 'new_core' options for creating mass_builds 2013-01-29 01:16:29 +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
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