Commit Graph

2540 Commits

Author SHA1 Message Date
konstantin.grabar 36da0cf808 [refs #374] Continue tests fix 2012-08-06 14:43:04 +04:00
konstantin.grabar f3db00832a [refs #374] Api v1 base functional and specs 2012-08-03 14:05:05 +04:00
konstantin.grabar f674735c8c [refs #374] Merge master into 374-rest_api_for_builds 2012-07-30 13:31:28 +04:00
Vladimir Sharshov 255bd3a73a Merge pull request #589 from warpc/551-old_bugs_with_by_object
[refs #551] by_object changed to by_actor.
2012-07-27 06:45:34 -07:00
George Vinogradov 2efb103084 [issue #551] Changed get to delete in spec. 2012-07-27 17:27:24 +04:00
George Vinogradov d5b0c96d1e [issue #551] Added spec. 2012-07-27 17:17:37 +04:00
Vladimir Sharshov 2105457d62 Merge pull request #587 from warpc/586-datatables_json_fixes
[refs #586] Custom JSON generators changed to JBuilder
2012-07-27 05:45:23 -07:00
George Vinogradov bbb03d3243 [issue #586] Removed @total_project & @total_user. 2012-07-27 16:40:13 +04:00
Vladimir Sharshov 5aecdc203b Merge pull request #571 from warpc/263-refactoring
[refs #263] Big git refactoring
2012-07-27 04:51:34 -07:00
Pavel Chipiga b476f7248c Minor refactor. Refs #263 2012-07-27 13:47:23 +03:00
George Vinogradov 40b0bb4b58 [issue #551] by_object changed to by_actor. 2012-07-27 08:12:09 +04:00
Vladimir Sharshov 95f1e13b96 Merge pull request #588 from warpc/583-build_list_page_fix
[refs #583] Remove control publication block from public vision
2012-07-26 16:26:48 -07:00
Vladimir Sharshov bc2eb541f3 [refs #583] Change and to && 2012-07-27 03:17:37 +04:00
Vladimir Sharshov 68b36c8ca9 Merge pull request #584 from warpc/578-user_creation_fix
[issue #578] Fixed error handling in PresonalRepository.
2012-07-26 14:44:23 -07:00
George Vinogradov 3e4c03dd6a [issue #583] Added missing check to BuildList page 2012-07-27 01:44:15 +04:00
Pavel Chipiga 566cd8209b Take back branches_and_repos method. Refs #263 2012-07-27 00:24:14 +03:00
Pavel Chipiga fb60dac748 Merge branch 'master' into 263-refactoring
Conflicts:
	db/schema.rb
2012-07-27 00:19:36 +03:00
Pavel Chipiga 35e673d44e Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263 2012-07-27 00:15:57 +03:00
George Vinogradov 03cc4668dc [issue #586] Custom JSON generators changed to JBuilder 2012-07-27 00:25:44 +04:00
konstantin.grabar 48f8c3ad08 [refs #374] Add json responses for build lists api 2012-07-26 13:22:51 +04:00
George Vinogradov f1839f0ad0 [issue #578] Added submit blocking to user creation 2012-07-26 02:12:06 +04:00
George Vinogradov 6f4f48cbce [issue #578] Fixed error handling in PresonalRepository. 2012-07-26 01:49:55 +04:00
Vladimir Sharshov 606609dea6 Merge pull request #580 from warpc/576-flash_notifies
[refs #576] Add flash notifies
2012-07-25 12:18:44 -07:00
Pavel Chipiga 03509e714c Merge branch 'master' into 263-refactoring 2012-07-25 21:42:48 +03:00
Pavel Chipiga e3ee41294d Use current locale for message body display. Refs #576 2012-07-25 21:21:52 +03:00
Pavel Chipiga 1362ee87c5 Add submenu for notifies section. Refs #576 2012-07-25 21:14:22 +03:00
Pavel Chipiga e09a9467e2 Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576 2012-07-25 21:05:25 +03:00
konstantin.grabar c0036a1bb5 [refs #576] Fix should_show? method and template offsets 2012-07-25 16:41:12 +04:00
Vladimir Sharshov 925ce3a55e Merge pull request #582 from warpc/581-root_destroy
[refs #581] Disable automatic delete child fork project when delete parent
2012-07-24 12:19:56 -07:00
Alexander Machehin a0a4c8b100 [refs #581] dont destroy child projects 2012-07-24 22:02:02 +06:00
konstantin.grabar 931e7a22b4 [refs #576] Merge master into 576-flash_notifies 2012-07-24 14:08:34 +04:00
konstantin.grabar 3d19a4f23e [refs #576] Optimize tests, views and model 2012-07-24 13:19:22 +04:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
Pavel Chipiga 2cc3798cdc Merge branch 'master' into 263-refactoring 2012-07-19 18:58:47 +03:00
Vladimir Sharshov 1c18ee48b2 Merge pull request #573 from warpc/183-track_only_production
[refs #183] Do not track in dev env
2012-07-18 03:13:27 -07:00
Alexander Machehin 3c4975ddf0 [refs #183] do not track dev 2012-07-18 16:11:24 +06:00
Alexander Machehin 0ac1f52e31 [refs #569] fixed hr style 2012-07-17 23:43:13 +06:00
Vladimir Sharshov c2064a05ad Merge pull request #572 from warpc/569-fork_list
[Refs #569] Fork modal: decrease size, add scrollbar.
2012-07-17 07:44:37 -07:00
Alexander Machehin 08534810f6 [refs #569] tuning fork modal 2012-07-17 20:25:02 +06:00
Alexander Machehin cd681ab0ae [refs #569] fixed fork modal 2012-07-17 19:49:13 +06:00
Pavel Chipiga 611b22baa5 Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263 2012-07-17 11:02:56 +03:00
Pasha d9755f295c Merge pull request #567 from warpc/523-block_import
[refs #523] Fix periodically error ActiveRecord::RecordNotFound in Resque service
2012-07-11 13:48:10 -07:00
Vladimir Sharshov 5b93ef9134 [refs #523] limit callback only for create action(update) 2012-07-12 00:40:55 +04:00
Vladimir Sharshov 84f4d7d423 [refs #523] limit callback only for create action 2012-07-12 00:24:31 +04:00
Vladimir Sharshov b22a2ce3ba [refs #523] Fix periodically error ActiveRecord::RecordNotFound in Resque service 2012-07-12 00:01:41 +04:00
Vladimir Sharshov c45e599eb0 Merge pull request #560 from warpc/442-mass_build
[refs #442] Add tests for mass builds and attr_accessible. Fix ability.
2012-07-10 02:49:23 -07:00
konstantin.grabar 1de9277e4a [refs #442] Add main? method for platforms 2012-07-10 11:06:08 +04:00
George Vinogradov cfb16f8118 [issue #561] Fixed bug on BuildList#show page 2012-07-10 03:57:25 +04:00
George Vinogradov f83a1ae6c2 [issue #561] Changed translations. 2012-07-10 02:55:34 +04:00
Vladimir Sharshov 3509edc81e Merge pull request #563 from warpc/561-build_lists_page_change
[issue #561] Some cosmetic changes for BuildList:

* Reordered columns in BuildLists table;
* Reordered rows in BuildLists filter;
* Removed created_at filter (Commented. See TODOs).
2012-07-09 15:16:32 -07:00