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

1291 Commits

Author SHA1 Message Date
Vokhmin Alexey V 61d638e172 #907: add count of commits 2013-02-12 20:52:01 +04: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 ac69547805 [refs #893] add regenerate metadata for repository 2013-02-11 21:24:17 +06:00
Vladimir Sharshov 53ecbd706b Merge pull request #897 from warpc/861-product_build_lists_api 
[refs #861] Product build lists api
 2013-02-08 01:58:29 -08:00
Alexander Machehin 797d7ffb1b [refs #861] fix product build lists routing 2013-02-08 00:36:57 +06:00
Vladimir Sharshov 0c69326e80 Merge pull request #900 from warpc/898-publish-i686-packages-into-x86_64-repository 
[refs #898]: publish i686 packages into x86 64 repository
 2013-02-07 06:57:09 -08:00
Vokhmin Alexey V e9c023f273 #898: add "publish_i686_into_x86_64" field into Project, update UI 2013-02-07 15:11:57 +04:00
Alexander Machehin 18d61b4915 [refs #861] add product build lists api 2013-02-07 01:05:49 +06:00
Vokhmin Alexey V 8629ae8ca3 #756: update UI 2013-02-06 13:42:34 +04:00
Vokhmin Alexey V 67e60f0a1d #756: update Observers, add TESTS_FAILED status 2013-02-05 22:49:26 +04: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 ffbd4d4f63 #873: update year in copyright message 2013-02-04 20:33:47 +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
Vokhmin Alexey V cfdd905306 #881: move "use_save_to_repository" field on #new page 2013-02-04 17:04:59 +04:00
Vokhmin Alexey V 34772d0404 #881: update field definition 2013-02-04 16:19:10 +04:00
Vokhmin Alexey V 4f4090b063 #881: change default value of param "use_save_to_repository" 2013-02-04 13:09:43 +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
Vokhmin Alexey V 973fabb31f #880: add option "Publish again" for build list 2013-02-01 18:39:17 +04:00
Vokhmin Alexey V db7a6f892f #881: add validation 2013-02-01 17:49:48 +04:00
Vokhmin Alexey V e9d666877c #881: add "use_save_to_repository" into BuildList 2013-02-01 14:00:56 +04:00
Vokhmin Alexey V 3fab64813e #859: update specs, API for build_list 2013-01-31 00:04:19 +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
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
Alexander Machehin 10d6173780 [refs #847] remove platform_not_found status 2013-01-25 17:18:28 +06:00
Vokhmin Alexey V 3c21ef6272 #851: update #show view 2013-01-25 15:01:55 +04:00
Alexander Machehin 090f40caee [refs #847] removed PLATFORM_PENDING & PROJECT_NOT_FOUND statuses 2013-01-24 23:55:24 +06: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 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 5a8232665f [refs #836] small refactoring 2013-01-22 22:41:25 +06: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 86034c5da4 #843: update pages for using only new_core 2013-01-21 19:52:20 +04:00
Alexander Machehin ca1e98efbf change translation 2013-01-21 17:02:08 +06:00
Vokhmin Alexey V 097ffacf61 #794: merge master into branch 2013-01-16 19:07:39 +04: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
Vokhmin Alexey V 1d79cf398b #823: change constants 2013-01-15 21:49:05 +04:00
Vokhmin Alexey V 6de772d230 #823: add logging for new task 2013-01-15 17:03:51 +04:00
Vokhmin Alexey V 81931be8cc #823: add BuildListsPublishTaskManager 2013-01-12 05:36:00 +04: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 6366080e0c fix en transtation 2012-12-29 20:51:09 +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
Vladmir Sharhsov(warpc) c307fa2834 Change wiki doc url for en version 2012-12-27 15:28:08 +04:00
Vokhmin Alexey V cd09f83944 #815: change "get" requests to "put" 2012-12-26 22:35:13 +04:00
Vokhmin Alexey V 1d2956419e #814: add validation for checking that repository contains project, update specs 2012-12-26 17:06:17 +04:00
Vokhmin Alexey V bce1b63d20 #794: merge master into the branch 2012-12-24 19:02:55 +04:00
Vokhmin Alexey V 577b71a62e #794: rename errors: "contains_<secret|public>_key" to "wrong_<secret|public>_key" 2012-12-24 17:58:46 +04:00
Vokhmin Alexey V f25a988730 #784: remove "build_requires" from BuildList 2012-12-24 17:17:21 +04:00
Vokhmin Alexey V da4860bc45 #794: add #key_pair action, add new specs 2012-12-20 23:46:16 +04:00
Vokhmin Alexey V 00de736c5e #794: add checking for passphrase 2012-12-20 19:00:30 +04:00
Vokhmin Alexey V 334b078855 #794: update KeyPair model, write migration 2012-12-19 22:18:00 +04:00
Vokhmin Alexey V 9a12de95bb #778: remove SymlinkStub module 2012-12-17 16:43:57 +04:00
Vokhmin Alexey V 8757724acc #778: update rails gem, update destroy Platform and Reposytory 2012-12-17 16:28:17 +04: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 6f623dbab5 #785: udd user to ProductBuildList, and etc changes 2012-12-14 19:14:33 +04:00
Alexander Machehin 2bb5d517a2 [refs #782] add base auth to git url 2012-12-14 17:25:10 +06:00
Alexander Machehin 4ae3a24e33 add ideas to bottom menu 2012-12-12 18:50:23 +06:00
Alexander Machehin 6fbad4c2ac [refs #762] moved missing projects to statuses column 2012-12-12 17:25:30 +06:00
Alexander Machehin 6635d9bdf0 remove comment 2012-12-11 23:02:33 +06:00
Alexander Machehin 9035bbb0ab restore syntax highlight 2012-12-11 22:57:00 +06:00
Alexander Machehin a452df79b8 [refs #762] refactoring 2012-12-11 19:48:16 +06:00
Vladimir Sharshov c677e37c20 Merge pull request #763 from warpc/759-stop-and-delete-action-for-build-list 
[refs #759]: cancel ProductBuildList and BuildList;
refactroing ProductBuildList; add new user role "tester"; set timeout for workers to 12 hours; refactoring worker_observers
 2012-12-07 03:58:57 -08:00
Vokhmin Alexey V 4039a92bfa #759: update error message 2012-12-07 15:23:41 +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 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 ef8ece3e87 #759: update status for BuildList::Item, fix getting logs 2012-12-06 20:28:44 +04:00
Vokhmin Alexey V ff2ae73985 #759: add action for cancel build, some refactoring 2012-12-06 18:41:24 +04:00
Alexander Machehin bdc2cd78fb [refs #758] add default branch validation 2012-12-06 13:18:16 +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 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
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 fcdbfd4538 add new column to build_lists table, some refactoring 2012-11-30 14:41:39 +04:00
Alexander Machehin 364e5d9b67 [refs #736] add to api build lists of the project 2012-11-29 23:52:15 +06:00
Alexander Machehin 76606036cb [refs #737] remove branch from commit message 2012-11-28 19:15:15 +06:00
Alexander Machehin c969d82c94 fix ru translate 2012-11-28 19:06:31 +06:00
vladdruzh c42fcc824a add to api maintainers index method 2012-11-26 15:32:23 +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
Vokhmin Alexey V 0f74aaedc1 #727: remove unnecessary fields 2012-11-20 16:33:29 +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 2203bb8ad0 update locales 2012-11-19 21:02:08 +04:00
Vokhmin Alexey V 894f8651d9 rename BUILD_IN_QUEUE to BUILD_PENDING 2012-11-19 20:38:08 +04:00
Vokhmin Alexey V edc6638b1e update statuses 2012-11-19 20:05:12 +04: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 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 b21046ba50 [refs #90] clean old temporary git 2012-11-14 21:48:20 +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 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 21d8a42072 merge master into the branch 2012-11-12 20:52:33 +04:00
Vokhmin Alexey V 51aff682d4 some refactoring according to Alexander's comments 2012-11-12 20:23:11 +04:00
Vokhmin Alexey V 259eeaecfc add Stop action and time_living for building ISO 2012-11-12 17:22:19 +04:00
Vladimir Sharshov 06421dbdec Merge pull request #714 from warpc/90-fix_orphan_pulls 
[refs #90] fixed orphan pulls
 2012-11-12 02:34:21 -08:00
Alexander Machehin 6ea04c5ccb Revert "disable auto import by cron" 
This reverts commit e3a404adf65767aa5473309aad1d9ebf6fb8907c.
 2012-11-12 15:26:24 +06: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
Alexander Machehin 8e7efac35b disable auto import by cron 2012-11-09 20:43:35 +06:00
Vokhmin Alexey V ef967e97ae small style changes 2012-11-09 17:51:33 +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 fc3dbbf698 added help for creating ISO 2012-11-08 15:11:44 +04:00
Alexander Machehin e9233d362a add new git_path param 2012-11-08 15:13:48 +06: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 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 ab57507f34 [refs #90] make common translation to commits and pulls 2012-10-26 20:12:14 +06: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 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 68dbae8c83 #698: added #create and #fork actions for Advisories API 2012-10-18 18:17:50 +04: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 6680265c64 #686: some refactoring of relations 2012-10-17 17:46:16 +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 d99a2104ce #692:added index action for Groups API 2012-10-16 15:49:07 +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 cef112efc3 [refs #579] first version of the outdated diff 2012-10-16 00:14:43 +06:00
Vokhmin Alexey V f3605a1211 #691: updated routes according to Vladimir's comments 2012-10-15 19:47:42 +04:00
Vokhmin Alexey V 0879a7e46f #691: added #notifiers and #update actions for Users API 2012-10-15 18:06:08 +04:00
Vokhmin Alexey V 2ae671df21 Merge branch 'master' into 691-rest-api-for-users 2012-10-15 17:03:05 +04:00
Vokhmin Alexey V e50bd3a2b5 #691: added #show action for Users API 2012-10-15 13:45:00 +04:00
Vokhmin Alexey V 00f5d0ce62 #672: updated Repositories API 2012-10-14 17:38:06 +04:00
Vokhmin Alexey V be8ed0984a #672: added #add_member, #remove_member, #update, #destroy actipns for Repository API 2012-10-14 16:00:49 +04:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +06:00
Vladimir Sharshov 4f21f0cb88 Add new school adress; change email send method to sendmail; add google check page 2012-10-12 00:16:51 +04: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
Vokhmin Alexey V 8f3ed58cd8 #671: added Projects#refs_list API action 2012-10-11 20:27:17 +04:00
Alexander Machehin 7f031ac688 [refs #374] added commit validation 2012-10-11 22:11:53 +06:00
Vokhmin Alexey V eef640e82c #671: added API Platforms#create action, updated specs, added validation to platform model 2012-10-10 21:45:56 +04:00
Vokhmin Alexey V 972877bc76 #671: added API Platforms#destroy action and specs 2012-10-10 19:43:14 +04:00
Vokhmin Alexey V d9c583e226 #671: added specs for API Platforms#clone action 2012-10-10 19:13:14 +04:00
Vokhmin Alexey V e5c6707594 #671: added #remove_member action for platforms API, updated specs 2012-10-09 21:07:10 +04:00
Vokhmin Alexey V 30909b281d #671: added #add_member action for platforms API, added new specs 2012-10-09 20:23:48 +04:00
Vokhmin Alexey V 9e6e2de955 #671: added #members action for platforms API 2012-10-09 19:06:27 +04:00
Vokhmin Alexey V feefe8ed89 #374: added #platforms_for_build action for Platforms API 2012-10-08 22:02:44 +04:00
Alexander Machehin 548f698526 [refs #579] add a line comment button 2012-10-08 20:42:38 +06: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 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 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
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
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Vokhmin Alexey V 234615d728 #658: added link to notification center in email 2012-10-01 17:08:02 +04:00
Alexander Machehin e7549635f0 [refs #90] change translation 2012-09-28 23:44:26 +06:00
Vladimir Sharshov 7756f6200d [refs #374] Add http headers for rate limit, restrict rate limit only for api calls. 2012-09-28 01:07:19 +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
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
Vladimir Sharshov 0dd103b7f4 [refs #374] Fix build list tests, remove unused code. 2012-09-27 03:54:56 +04:00
Vladimir Sharshov 4402f676c3 Increase hourly request limit, remove daily limit 2012-09-27 01:59:31 +04: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 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
Vokhmin Alexey V 397d411252 #90: added #index action, updated routes 2012-09-26 00:50:40 +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 9be978eb68 #648: updated models, JS, controller according to comments and discussions 2012-09-24 22:04:53 +04:00
Alexander Machehin 51c9375613 [refs #616] change preview translation 2012-09-24 23:40:41 +06:00
Vokhmin Alexey V cee1ee6cb6 #648: small refactoring 2012-09-23 20:22:49 +04:00
konstantin.grabar 7812adfdbc [refs #374] Add custom http basic auth for api 2012-09-21 23:15:56 +04:00
Vokhmin Alexey V 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 e94c6f4f00 [refs #374] Merge master into 374-rest_api_for_builds 2012-09-21 13:20:04 +04:00
Alexander Machehin 1dcce7bf92 [refs #616] small fixes 2012-09-20 20:58:14 +06:00
Vokhmin Alexey V 799a1464fb #385: fixed 2012-09-20 18:26:26 +04:00
Alexander Machehin 32e05de186 [refs #616] cheat sheet small i18n 2012-09-20 00:53:40 +06:00
Alexander Machehin a85a95d18a [refs #616] markdown cheat sheet 2012-09-19 23:35:43 +06:00
konstantin.grabar f7d28dd23c [refs #374] Patch Rack::Throttle http_error method. Finish main page 
text
 2012-09-19 19:02:54 +04:00
Alexander Machehin 4fc9ba7aeb [refs #616] add lost i18n 2012-09-19 15:41:08 +06:00
Vokhmin Alexey V 967c5daaa8 #575: added 'arch' to subject and body of email 2012-09-18 16:03:10 +04: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 ef923d06c7 #575: added build_list_notification 2012-09-16 21:29:45 +04:00