Commit Graph

2638 Commits

Author SHA1 Message Date
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06: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
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 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
Alexander Machehin d130409640 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
Alexander Machehin 27ad29d365 [refs #90] some inline callback refactoring 2012-07-19 22:55:23 +06:00
Alexander Machehin 35b953ac11 [refs #90] add commit/pull lines ref 2012-07-19 22:42:37 +06:00
Pavel Chipiga 2cc3798cdc Merge branch 'master' into 263-refactoring 2012-07-19 18:58:47 +03:00
Alexander Machehin b24a4a35b2 [refs #90] modify pull tab urls 2012-07-19 00:02:27 +06:00
Alexander Machehin 28329bbe5b [refs #90] fixed ref link 2012-07-18 17:17:15 +06:00
Alexander Machehin b7911f3585 [refs #90] fixed create pull button text 2012-07-18 16:29:55 +06: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
Alexander Machehin b9e1f44fe8 [refs #90] remove old code 2012-07-17 23:02:55 +06:00
Alexander Machehin dc521f5844 [refs #90] link to refs 2012-07-17 22:40:48 +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
Alexander Machehin 966368a660 [refs #90] show same title and body for issues and pulls 2012-07-17 16:50:40 +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
Alexander Machehin 5b4c9b0948 [refs #90] remove reduntant information 2012-07-16 23:38:45 +06:00
Alexander Machehin b903969aa6 [refs #90] changed displaying status message 2012-07-16 23:02:04 +06:00
Alexander Machehin 2feb03601b [refs #90] fixed authorize of the merge action 2012-07-16 22:35:44 +06:00
Alexander Machehin 34e97510cd [refs #90] modify pull headers 2012-07-16 22:27:41 +06:00
Alexander Machehin 56db0fffd0 [refs #90] small refactoring 2012-07-16 14:46:44 +06:00
Alexander Machehin 26617b7739 [refs #90] add close/reopen button 2012-07-12 20:15:28 +06: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