Commit Graph

126 Commits

Author SHA1 Message Date
Alexander Machehin 7d1c5f381b restore redhillonrails_core gem 2013-03-19 18:30:34 +06:00
Alexander Machehin d3469f524a update rails to 3.2.13 && gems update 2013-03-19 15:15:14 +06:00
Vokhmin Alexey V 290c63b14a update path to rubygems.org 2013-03-11 14:44:52 +04:00
Vokhmin Alexey V 5a8ed6124a remove "json" gem from Gemfile 2013-02-12 13:06:04 +04:00
Vokhmin Alexey V 8aeda1f087 Update "rails" and "json" gems 2013-02-12 12:57:03 +04:00
Vokhmin Alexey V 7868434f99 #883: update "newrelic_rpm" gem, bundle update 2013-02-04 19:19:04 +04:00
Alexander Machehin 87be12a6b7 Fix error with avatars:
[paperclip] An error was received while processing:
Paperclip::Errors::NotIdentifiedByImageMagickError: ... is not recognized by the 'identify' command.
2013-02-04 00:44:33 +06:00
Alexander Machehin 9297699a79 [refs #811] add Turbo Sprockets 2013-01-25 13:18:50 +06:00
Vokhmin Alexey V 097ffacf61 #794: merge master into branch 2013-01-16 19:07:39 +04:00
Alexander Machehin 71125eac81 update rails to 3.2.11 2013-01-09 14:25:21 +06:00
Alexander Machehin 2a5a955bfb [refs #796] use MockRedis in specs 2012-12-26 19:07:54 +06:00
Vokhmin Alexey V 0ad9932561 #794: fixes for failed specs 2012-12-20 22:50:55 +04:00
Vokhmin Alexey V 334b078855 #794: update KeyPair model, write migration 2012-12-19 22:18:00 +04:00
Vokhmin Alexey V 8757724acc #778: update rails gem, update destroy Platform and Reposytory 2012-12-17 16:28:17 +04:00
Alexander Machehin 345e4f698b Merge branch 'master' into file-store-4_git_task
Conflicts:
	Gemfile
2012-11-02 23:08:38 +06:00
Alexander Machehin 6d3a2e7bb3 Merge remote-tracking branch 'origin/file-store-4_git_task' into file-store-4_git_task 2012-11-01 23:39:08 +06:00
Alexander Machehin 84920c358a [refs file-store-4] upload to file-store 2012-11-01 23:37:09 +06:00
Vokhmin Alexey V 36ae61cea0 #686: updated jbuilder gem 2012-10-17 16:18:05 +04:00
Vokhmin Alexey V 6bc3c4b9a8 #90: updated redhillonrails_core gem 2012-10-01 22:09:59 +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 181e95a9d2 Moving Apidocs to separate project 2012-09-27 01:06:57 +04:00
Alexander Machehin 855f1f356d [refs #616] remove some inline styles 2012-09-21 18:10:47 +06:00
konstantin.grabar e94c6f4f00 [refs #374] Merge master into 374-rest_api_for_builds 2012-09-21 13:20:04 +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
konstantin.grabar 15ec2c2c90 [refs #374] Add nanoc api docs 2012-09-07 20:55:48 +04:00
konstantin.grabar 58d9a972ef [refs #374] Add rate limit 2012-09-04 22:48:14 +04:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
Pavel Chipiga 0ff8f92b62 Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263 2012-08-15 16:52:32 +03:00
Pavel Chipiga 01a3572de0 Minor update. Fix helper bug. Minor refactor. Refs #263 2012-07-31 17:35:18 +03:00
Pavel Chipiga 27030566a4 Update rails, grit, gollum. Fix re-encoding bug. Refs #263 2012-07-30 02:32:23 +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
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
konstantin.grabar dc8a11fa68 [refs #505] Merge master into 505-state_machine_migrate 2012-06-19 13:43:38 +04:00
Pavel Chipiga b47b4ec075 Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510 2012-06-16 21:27:46 +03:00
konstantin.grabar 76b261638f Merge master into 505-state_machine_migrate 2012-06-14 10:34:55 +04:00
konstantin.grabar f37e0e54a3 [refs #510] Replace dj with resque 2012-06-09 16:52:29 +04:00
konstantin.grabar 38b55d769f [refs #510] Add resque async workers 2012-05-31 11:02:25 +04:00
konstantin.grabar 44de11d009 [refs #505] Add events, states and other base state machine logic 2012-05-28 21:47:53 +04:00
Pavel Chipiga b1b5363972 Fix deploy. Redo main group route. Refs #263 2012-05-03 19:48:22 +03:00
Pavel Chipiga 7af06cc7ab Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263 2012-04-23 23:55:42 +03:00
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
2012-04-23 17:58:45 +03:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
George Vinogradov 71c8efabf9 [issue #347] Added backbone. Changed collaborators page. 2012-04-09 21:11:39 +04:00
Pavel Chipiga 531ba0a35f Add rspec to dev env, change repo source. Take back rails_datatables to plugins with all files. Refs #263 2012-03-30 00:24:57 +03:00
Pavel Chipiga 050398c39f Merge branch 'master' into 263-refactoring
Conflicts:
	db/schema.rb
2012-03-30 00:02:59 +03:00
Pavel Chipiga 583918fa68 Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263 2012-03-29 23:34:22 +03:00
Vladimir Sharshov 4dd97d8c63 [Refs #263] Remove xml-rpc gem, clear CanCan abilities and tests 2012-03-30 00:24:45 +04:00
George Vinogradov baf35da99c [issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
	app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
George Vinogradov 9bb1d80172 [issue #195] Added AJAX to /projects list. 2012-03-27 19:50:00 +04:00
Pavel Chipiga 4553affa56 Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190, #134 2012-03-22 19:11:12 +02:00