Commit Graph

1644 Commits

Author SHA1 Message Date
Vokhmin Alexey V 6e440d56ff #880: fix UI for creating container 2013-02-04 17:54:09 +04: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
Vladimir Sharshov 27251a38be Merge pull request #884 from warpc/881-disable-personal-repository-on-creating-build-list
[refs #881]: Ability do not conntect personal repository as packages source.
2013-02-04 05:30:14 -08:00
Vokhmin Alexey V cfdd905306 #881: move "use_save_to_repository" field on #new page 2013-02-04 17:04:59 +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
Vokhmin Alexey V 973fabb31f #880: add option "Publish again" for build list 2013-02-01 18:39:17 +04:00
Vokhmin Alexey V 871976af26 #881: update UI, API of #show action 2013-02-01 14:14:11 +04:00
Vokhmin Alexey V e9d666877c #881: add "use_save_to_repository" into BuildList 2013-02-01 14:00:56 +04:00
Alexander Machehin 8860238da4 [refs #878] fix some bugs when no master branch 2013-01-31 22:26:49 +06:00
Vokhmin Alexey V ad08a31e5f #860: merge master into branch 2013-01-29 23:23:52 +04:00
Vokhmin Alexey V 52cd67e1c3 #860: small refactoring 2013-01-29 01:50:27 +04:00
Vokhmin Alexey V ba132b0824 #860: update BuildList API 2013-01-28 19:02:19 +04:00
Vokhmin Alexey V fed1c76ca2 #860: update logic for creating build list container 2013-01-28 18:44:06 +04:00
Vladimir Sharshov 3e0efd8973 Merge pull request #855 from warpc/765-form_resize
[refs #765] add CodeMirror resizable ability for git edit fields
2013-01-28 01:24:49 -08:00
Alexander Machehin 421fa2880c [refs #765] add CodeMirror resizable ability 2013-01-28 14:15:01 +06:00
Vokhmin Alexey V f4c3d23d7c create container for BuildList 2013-01-25 21:24:46 +04:00
Vokhmin Alexey V d8b1d68ea9 #851: hot fix 2013-01-25 15:51:16 +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
Vladimir Sharshov a914cc64f5 Merge pull request #852 from warpc/851-build_lists-show-undefined-method-error
[refs #851]: destroy build_lists after removing repository.
2013-01-25 03:35:03 -08:00
Vokhmin Alexey V 6c6882a710 #851: change message 2013-01-25 15:31:00 +04:00
Vokhmin Alexey V 3c21ef6272 #851: update #show view 2013-01-25 15:01:55 +04:00
Alexander Machehin 643e163652 [refs #847] refactoring 2013-01-24 19:09:26 +06:00
Vokhmin Alexey V b46c1e963f #848: update StatusInspector, UI 2013-01-24 14:42:03 +04:00
Alexander Machehin 5a8232665f [refs #836] small refactoring 2013-01-22 22:41:25 +06:00
Vokhmin Alexey V 388b606f22 #836: add packages into build_list, add url to package 2013-01-22 19:39:56 +04:00
Vokhmin Alexey V f0928badc8 #836: update build_lists UI, API 2013-01-22 19:28:59 +04: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 d2a876c9cb #843: remove 'latest_' prefix 2013-01-21 21:08:19 +04:00
Vokhmin Alexey V 86034c5da4 #843: update pages for using only new_core 2013-01-21 19:52:20 +04:00
Vokhmin Alexey V 694ca374c9 show BuildList#new_core field in API 2013-01-19 18:10:09 +04:00
Vokhmin Alexey V 9ed324f9ab Merge branch 'master' into 794-move-all-keys-into-abf-bd 2013-01-18 20:01:12 +04:00
Vokhmin Alexey V 097ffacf61 #794: merge master into branch 2013-01-16 19:07:39 +04:00
Alexander Machehin 525a30c471 [file-store-12] add role to current user 2013-01-16 16:08:24 +06:00
Vladimir Sharshov 7b5af80d20 Merge pull request #833 from warpc/823-publication-groups-of-build-lists
[refs #823]: Association of packages in the group to expedite the publication
2013-01-15 09:55:00 -08:00
Vladimir Sharshov a6db2a21f9 Merge pull request #821 from warpc/818-system_users
[refs #818] Add system role: for build clients or file-store.
2013-01-15 05:03:08 -08:00
Vokhmin Alexey V 6bd28dacb0 Merge branch 'master' into 823-publication-groups-of-build-lists 2013-01-15 15:36:02 +04:00
Alexander Machehin 49589e5c56 [refs #790] enable remember me by default 2013-01-11 16:22:42 +06:00
Alexander Machehin 182a90af4a [refs #818] refactoring part4 2013-01-11 16:03:24 +06:00
Alexander Machehin be095223e4 [refs #818] change new header 2013-01-10 22:46:44 +06:00
Alexander Machehin ba026c948d [refs #818] refactoring part 3 2013-01-10 22:43:36 +06:00
Alexander Machehin 1427f86b4c [refs #818] add simple user navigation 2013-01-10 21:56:43 +06:00
Alexander Machehin abf83a563d [refs #818] small refactoring part2 2013-01-10 21:50:49 +06:00
Alexander Machehin 493fe9da90 Merge branch 'master' into 818-system_users 2013-01-10 19:23:58 +06:00
Vokhmin Alexey V c521e5d77e #780: add sha1 field into build_list_packages table, update models, views 2013-01-10 15:16:08 +04:00
Alexander Machehin 70903249ce [refs #818] small ui changes 2012-12-29 18:38:14 +06:00
Vladimir Sharshov e27c01a711 Merge pull request #824 from warpc/712-refactoring-css
[issue #795] The wrong time to be displayed on the page assembly jobs when user have incorect local time
2012-12-28 11:44:18 -08:00
Alexander Machehin 1e878f0775 [refs #818] working with system users 2012-12-29 01:24:41 +06:00
Julea Pikareva 079d6578d3 [issue #795] output server time
reduction to a single style
2012-12-28 20:34:10 +04:00
Julea Pikareva 87a6134da0 [issue #795] output server time
hot fix
2012-12-28 18:03:17 +04:00
Julea Pikareva dcc936fdb6 [issue #795] output server time
fix
2012-12-28 17:50:40 +04:00
Julea Pikareva 5e28b81046 [issue #795] output server time
Time change from local to server
2012-12-28 15:02:59 +04:00
Vokhmin Alexey V f0b9d23bc2 Merge branch 'master' into 794-move-all-keys-into-abf-bd 2012-12-25 18:24:01 +04:00
Alexander Machehin 7d58b89366 add a new core option to mass_builds 2012-12-25 18:15:20 +06:00
Vokhmin Alexey V bce1b63d20 #794: merge master into the branch 2012-12-24 19:02:55 +04:00
Vokhmin Alexey V ea14f541fe #784: merge master into the branch 2012-12-24 18:11:27 +04:00
Vokhmin Alexey V 9b8a55db42 #794: merge master into the branch 2012-12-24 18:07:09 +04:00
Vokhmin Alexey V f25a988730 #784: remove "build_requires" from BuildList 2012-12-24 17:17:21 +04:00
Vokhmin Alexey V ac762388a4 #800: enable "new_core" for personal platforms 2012-12-24 16:35:29 +04:00
Vokhmin Alexey V a558ec622f #794: fix undefined method 'public' for nil:NilClass 2012-12-21 18:06:07 +04:00
Vokhmin Alexey V da4860bc45 #794: add #key_pair action, add new specs 2012-12-20 23:46:16 +04:00
Alexander Machehin ee38193efc [refs #789] fixed hardcoding file-store url 2012-12-20 19:45:46 +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
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
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
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
Alexander Machehin 6fbad4c2ac [refs #762] moved missing projects to statuses column 2012-12-12 17:25:30 +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
Alexander Machehin fdce6eb325 [refs #762] move js code to assets 2012-12-11 20:03:55 +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
Alexander Machehin ea542de6f1 [refs #762] change ui 2012-12-11 00:02:34 +06: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 a8e1cea057 #759: save sec of time_living instead of minut, some fixes of state_machine 2012-12-07 15:11:12 +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 ff2ae73985 #759: add action for cancel build, some refactoring 2012-12-06 18:41:24 +04: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 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 42e76f5fa6 [refs #674] fix undefined method 'last_published_commit_hash' for product build list 2012-12-04 09:33:04 +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
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
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 791f77dfd5 add 'New core' option for creating build_list 2012-11-29 19:12:24 +04:00
Alexander Machehin 8ca41377fc [refs #736] add git url 2012-11-28 23:25:28 +06:00
Alexander Machehin 76606036cb [refs #737] remove branch from commit message 2012-11-28 19:15:15 +06: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
vladdruzh c42fcc824a add to api maintainers index method 2012-11-26 15:32:23 +04:00
Vokhmin Alexey V 7fcd3d6780 update url for search results 2012-11-21 17:49:34 +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
Vokhmin Alexey V 846aedf49d add canceling status 2012-11-19 19:41:59 +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 34bb256ff1 Merge pull request #715 from warpc/iso-worker
[refs #711] Integration Iso worker
2012-11-14 03:14:28 -08: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
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 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 259eeaecfc add Stop action and time_living for building ISO 2012-11-12 17:22:19 +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 fc3dbbf698 added help for creating ISO 2012-11-08 15:11:44 +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
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 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
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
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
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 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 d5ad5b1a95 Merge branch 'master' into 698-rest-api-for-advisories 2012-10-18 18:59:00 +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
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 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
Alexander Machehin 3868fbf4f3 [refs #579] forgot change to the pull.repo 2012-10-16 19:22:19 +06: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
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
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 cef112efc3 [refs #579] first version of the outdated diff 2012-10-16 00:14:43 +06:00
Alexander Machehin ef37180825 [refs #579] small activity refactoring 2012-10-15 22:50:21 +06:00
Alexander Machehin fb1288e382 [refs #579] ugly sorting common pull comments 2012-10-15 22:33:16 +06:00
Vladimir Sharshov c115a37a04 Merge pull request #695 from warpc/add-invitation-link-to-register_requests-table
added invitation link to the table
2012-10-15 08:28:35 -07:00
Alexander Machehin a7a442c4e1 [refs #90] fixed rendering diff 2012-10-15 21:24:29 +06:00
Vokhmin Alexey V 3e0b3b8bfc added invitationlink to the table 2012-10-15 19:24:20 +04:00
Vokhmin Alexey V 0879a7e46f #691: added #notifiers and #update actions for Users API 2012-10-15 18:06:08 +04:00
Alexander Machehin 00323cec82 [refs #579] grouped commits 2012-10-15 16:03:35 +06:00
Vokhmin Alexey V e50bd3a2b5 #691: added #show action for Users API 2012-10-15 13:45:00 +04:00
Alexander Machehin c5d6707b8f [refs #579] fixed commit comments errors 2012-10-13 01:57:54 +06:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +06:00
Alexander Machehin 6981a7f238 [refs #648] disable submiting the project filter form 2012-10-12 16:24:51 +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 a7bb5f48ba [refs #90] fixed wiki diff 2012-10-11 01:16:47 +06: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
Vokhmin Alexey V d83243a3a3 hot fix for API 2012-10-09 17:47:05 +04:00
Alexander Machehin 548f698526 [refs #579] add a line comment button 2012-10-08 20:42:38 +06:00
Vokhmin Alexey V ec0ec5fc32 #374: revert some changes 2012-10-08 17:37:09 +04:00
Vokhmin Alexey V b1a9e2aa21 #374: updated api for projects 2012-10-08 16:47:02 +04:00
Alexander Machehin f12634cee8 [refs #579] add link to comments 2012-10-08 15:14:31 +06:00
Alexander Machehin ed7aec602f [refs #579] alpha version of the pull inline comments 2012-10-06 01:19:05 +06:00
Alexander Machehin 2360a25a42 [refs #579] fixed many errors 2012-10-05 17:02:25 +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 a24ea9a4b1 [refs #579] fixed & refactoring markdown help 2012-10-05 14:16:27 +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 b3123a752e #671: updated build list api 2012-10-04 19:38:33 +04:00
Vokhmin Alexey V 21a0d982f1 #671: updated arch field in json for build_lists API 2012-10-04 19:30:31 +04:00
Vokhmin Alexey V 4b72501159 #671: added Architectures API 2012-10-04 16:45:49 +04:00
Vokhmin Alexey V 04b2647ef0 #668: added uploading avatars for groups 2012-10-03 20:38:42 +04:00
Alexander Machehin 94029c3cda [refs #90] base -> to, head -> from 2012-10-03 17:58:34 +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
Vokhmin Alexey V ba7a7b20a5 #349: updated locales, added shared template 2012-10-02 19:20:58 +04: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
Alexander Machehin f66f80c128 Merge branch 'master' into 90-ui
Conflicts:
	spec/controllers/projects/pull_requests_controller_spec.rb
2012-10-02 19:43:23 +06:00
Vladimir Sharshov 226f1b592c Merge pull request #663 from warpc/90-add-specs-for-pull-requests
[refs #90]: add specs for pull requests
2012-10-01 11:12:01 -07:00
Alexander Machehin f92f209323 [refs #90] fixed changing base project 2012-10-01 23:43:15 +06:00
Alexander Machehin 948e0892bf [refs #90] markdown in create pull 2012-10-01 22:48:26 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Vokhmin Alexey V 3271fd8479 #658: small refactoring 2012-10-01 17:33:46 +04:00
Vokhmin Alexey V 234615d728 #658: added link to notification center in email 2012-10-01 17:08:02 +04:00
Alexander Machehin 9b9295ba4f [refs #90] change ui on create pull 2012-09-28 23:46:02 +06:00
Vokhmin Alexey V fb8d1ded5f #90: added some specs for pull requests 2012-09-28 19:08:51 +04:00
Vladimir Sharshov 847ecc2a15 [refs #374] Remove unused data from build list api 2012-09-28 14:38:01 +04:00
Vokhmin Alexey V e310f5607c #90: removed unnecessary code 2012-09-27 23:30:59 +04:00
Vokhmin Alexey V 7e09f17b58 Merge branch 'master' into 90-create-discussion-in-the-pull-requests-like-github 2012-09-27 22:37:54 +04: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
Vokhmin Alexey V dfada7a270 #90: fixed NoMethodError on #show page for guest 2012-09-27 21:21:10 +04:00
Vokhmin Alexey V 3fdca32e0e #90: updated styles 2012-09-27 20:59:48 +04:00
Vokhmin Alexey V da006871ba #90: small refactoring, moved views 2012-09-27 20:32:28 +04:00
Vokhmin Alexey V f41aaecd72 #90: added commits and comments for commits to pull-request discussion 2012-09-27 19:40:19 +04: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 223aa33604 [refs #374] Add info about API doc site 2012-09-27 17:55:16 +04:00
Vladimir Sharshov 7c4c855341 [refs #374] Small refactoring 2012-09-27 17:41:02 +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 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 0ebc545b01 #90: small refactoring of views 2012-09-26 19:16:34 +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 eba6a14e0b [refs #90] very small refactoring 2012-09-26 15:27:24 +06:00
Vokhmin Alexey V 397d411252 #90: added #index action, updated routes 2012-09-26 00:50:40 +04:00
Alexander Machehin 47a73a4ddb [refs #90] fixed existing project name 2012-09-25 21:47:08 +06: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 d15094f128 #648: moved 'Create' button 2012-09-25 00:03:33 +04:00
Vokhmin Alexey V 91f215351c #648: small refactoring according to comment 2012-09-24 23:27:00 +04:00
Vokhmin Alexey V 9be978eb68 #648: updated models, JS, controller according to comments and discussions 2012-09-24 22:04:53 +04:00
Vokhmin Alexey V cee1ee6cb6 #648: small refactoring 2012-09-23 20:22:49 +04:00
Vokhmin Alexey V ceeae09332 #648: small revert, updated filter name 2012-09-21 22:08:19 +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
Alexander Machehin 855f1f356d [refs #616] remove some inline styles 2012-09-21 18:10:47 +06:00
Alexander Machehin 94c3863e27 [refs #616] fixed markdown image example 2012-09-21 16:43:54 +06:00
Alexander Machehin d25bdb2329 [refs #616] fixed preview bug 2012-09-21 16:32:53 +06:00
konstantin.grabar e94c6f4f00 [refs #374] Merge master into 374-rest_api_for_builds 2012-09-21 13:20:04 +04:00
konstantin.grabar e027eee40c [refs #374] Update api platforms list docs and code 2012-09-20 19:07:06 +04:00
Vokhmin Alexey V 799a1464fb #385: fixed 2012-09-20 18:26:26 +04:00
Vladimir Sharshov 7e28920bc7 Merge pull request #653 from warpc/385-change-name-for-git-archives
[refs #385] Support download project source code by build clients(rpmbuild)
2012-09-20 06:37:13 -07:00
Vokhmin Alexey V b398a0e456 #634: fixed 2012-09-20 16:43:23 +04:00