Commit Graph

6792 Commits

Author SHA1 Message Date
Vokhmin Alexey V 57b8761f1e Merge branch 'master' into rails-4.1.9 2015-03-11 01:37:55 +03:00
avokhmin ba84f0f916 Merge pull request #461 from abf/rosa-build:446-default_branch
Aliased projects should have same default branch
2015-03-11 02:37:33 +04:00
Alexander Machehin 1c6f8c5127 [#446] small refactoring 2015-03-10 20:54:42 +05:00
Alexander Machehin 4026b75784 [#446] aliased projects should have same default branch 2015-03-10 20:51:38 +05:00
Alexander Machehin d29fb8f39a feed improvements: in progress 2015-03-10 13:55:57 +05:00
Vokhmin Alexey V 0ca2f9e383 Update specs 2015-03-06 02:45:37 +03:00
Vokhmin Alexey V d6234ae758 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/controllers/projects/git/trees_controller.rb
2015-03-06 00:53:44 +03:00
Vokhmin Alexey V 535ef43364 Fixed: NotImplementedError #sha1_of_file_store_files 2015-03-06 00:38:45 +03:00
Alexander Machehin 9e73646f91 add content type 2015-03-05 17:51:54 +05:00
Alexander Machehin 9f53a384db [#369] dont redirect to project if get an ajax request 2015-03-05 10:57:28 +05:00
Vokhmin Alexey V 3ed742e39a Use only state_machines-activerecord gem 2015-03-05 03:01:52 +03:00
Vokhmin Alexey V 7f285fce5c added state_machines-activerecord gem 2015-03-05 02:39:16 +03:00
Vokhmin Alexey V 3eeb75b554 Removed ".css" suffixes 2015-03-05 02:23:23 +03:00
Vokhmin Alexey V 84e7145d6d rename *_filter => *_action 2015-03-05 02:19:19 +03:00
Vokhmin Alexey V 5e5d3905e4 Update rails to 4.1.9 2015-03-05 02:09:50 +03:00
Vokhmin Alexey V f6257a97f6 Merge branch 'master' of abf.rosalinux.ru:abf/rosa-build 2015-03-04 13:13:17 +03:00
Alexander Machehin 965ad24a72 [#369] git tree: fix load more 2015-03-04 15:01:42 +05:00
Vokhmin Alexey V 15805bbdaf Fixed: Circular dependency detected while autoloading constant ProductBuildList::AbfWorkerable 2015-03-04 01:23:30 +03:00
Vokhmin Alexey V 62823c4c06 Merge branch 'master' of abf.rosalinux.ru:abf/rosa-build 2015-03-04 00:58:27 +03:00
Vokhmin Alexey V 41d72ce87a Added build_completed_partially status for ProductBuildList 2015-03-04 00:04:37 +03:00
Alexander Machehin e745171ca4 fix undefined method 'builds_setting' for nil:NilClass 2015-03-03 17:23:44 +05:00
Vokhmin Alexey V 264ea371f6 Use user build configs for filtering in BuildLists#index 2015-03-03 00:44:25 +03:00
Vokhmin Alexey V f6bcb8788f Fixed: creation of mass builds for personal platforms 2015-03-03 00:06:24 +03:00
avokhmin 97986864ad Merge pull request #460 from abf/rosa-build:twitter-meta-tags
Add Twitter meta tags
2015-02-28 15:09:23 +04:00
Alexander Machehin 5aa06da501 [#369] fix rendering spec files 2015-02-28 11:39:22 +05:00
Vokhmin Alexey V 8a8c2741d8 Added description for some pages 2015-02-28 01:58:22 +03:00
Vokhmin Alexey V 480b21d641 Added Twitter meta tags 2015-02-28 01:33:13 +03:00
Alexander Machehin 4da6b1a84a [#369] platform contents: change the current page location 2015-02-27 20:39:22 +05:00
Alexander Machehin 114637596d autocomplete project by owner with name 2015-02-27 14:58:38 +05:00
avokhmin 4a11ac280a Merge pull request #459 from abf/rosa-build:meta-tags
Add meta tags
2015-02-27 03:36:19 +04:00
Vokhmin Alexey V 4b806e9ca4 Merge branch 'master' into meta-tags 2015-02-27 02:27:19 +03:00
Vokhmin Alexey V 9c516adbc4 Update size of fb-image.png 2015-02-27 01:52:45 +03:00
Vokhmin Alexey V b2a3fb5ff0 Added meta tags for tour and issue pages 2015-02-27 01:39:51 +03:00
Alexander Machehin fcd6d7ec2a fix pull requests API (creating a pull request from another project) 2015-02-26 15:14:42 +05:00
Vokhmin Alexey V 9cc7191b12 Add og meta tags 2015-02-26 05:01:47 +03:00
Vokhmin Alexey V bf7b130ec1 Added locales for FacebookHelper 2015-02-25 02:10:43 +03:00
Vokhmin Alexey V 9a45ebc30e Add FacebookHelper, wip 2015-02-25 02:10:20 +03:00
Alexander Machehin 31cbbc8bf5 fix warning: duplicated key at line 21 ignored: :name 2015-02-24 12:30:07 +05:00
Alexander Machehin b5a0249f35 [#446] fix a fork from an aliased project 2015-02-24 12:22:12 +05:00
avokhmin d61fdb35ad Merge pull request #458 from abf/rosa-build:456-default-branch-for-all-projects-of-a-group
#456: Default branch for all projects of a group
2015-02-20 14:41:05 +04:00
Vokhmin Alexey V 13cd263855 #456: add integration with Group#default_branch, specs 2015-02-20 01:03:04 +03:00
Vokhmin Alexey V 192bcb7b5f Merge branch 'master' into 456-default-branch-for-all-projects-of-a-group 2015-02-19 23:52:08 +03:00
Vokhmin Alexey V e5325dce8c Updated UI of Contents#index 2015-02-19 23:42:20 +03:00
Vokhmin Alexey V 61dc5ca967 Add default_branch for Platform API response 2015-02-19 23:13:47 +03:00
Vokhmin Alexey V 8a4351850c add visibility for all responses from Projects API 2015-02-19 22:28:51 +03:00
Vokhmin Alexey V 264462afc6 increase access rights for publish into testing repo 2015-02-19 21:11:13 +03:00
avokhmin a01661abaf Merge pull request #457 from abf/rosa-build:rails-4.0.13
Update rails to 4.0.13
2015-02-19 14:35:41 +04:00
Vokhmin Alexey V 2e053eff0a cleanup 2015-02-19 13:34:43 +03:00
Vokhmin Alexey V f6e4fda738 updated specs for platform API 2015-02-19 04:59:20 +03:00
Vokhmin Alexey V ec3ea92870 updated specs 2015-02-19 04:53:47 +03:00