Commit Graph

1744 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
Alexander Machehin 4026b75784 [#446] aliased projects should have same default branch 2015-03-10 20:51:38 +05: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
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 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 41d72ce87a Added build_completed_partially status for ProductBuildList 2015-03-04 00:04:37 +03:00
Alexander Machehin 114637596d autocomplete project by owner with name 2015-02-27 14:58:38 +05: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 13cd263855 #456: add integration with Group#default_branch, specs 2015-02-20 01:03:04 +03:00
Vokhmin Alexey V 7efe8894ff Added ability to use specific branch for each platform 2015-02-18 01:33:58 +03:00
avokhmin 693c3f6660 Merge pull request #453 from abf/rosa-build:452-default-platforms
#452: Make it possible to hide specific platforms on the new build page
2015-02-12 03:23:55 +04:00
Alexander Machehin 516a7a3df9 [#369] project settings: fix a maintainer autocomplete 2015-02-11 15:32:55 +05:00
Vokhmin Alexey V 2a01474d03 #452: added "Builds settings" for user 2015-02-11 01:08:39 +03:00
Alexander Machehin a1fae2f1b1 [#369] new pull request: fix a 'To project' typehead 2015-02-10 16:57:16 +05:00
Vokhmin Alexey V 21ca8dae32 #369: init project version for ProductBuildList 2015-02-06 01:35:18 +03:00
Alexander Machehin 424927dd89 [#369] new pull: autoselect project 2015-02-04 23:33:24 +05:00
Alexander Machehin b245c2a808 [#446] alias api 2015-02-04 17:02:45 +05:00
Alexander Machehin f1daf3d146 add status to the error pages 2015-02-03 01:27:53 +05:00
Alexander Machehin 692ffa9dc4 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/controllers/application_controller.rb
2015-02-02 23:38:48 +05:00
Alexander Machehin c583e6bcef [abf/abf-ideas#155] remove redirect when rendering error pages 2015-02-02 23:37:55 +05:00
Alexander Machehin 56fb9016ab remove redirect when render error page 2015-02-02 23:23:47 +05:00
Alexander Machehin 79dbe762e5 [#369] fix double render 2015-02-02 23:21:28 +05:00
Alexander Machehin fb438e3c75 remove redirect when render error page 2015-02-02 23:20:45 +05:00
Alexander Machehin cf39b3911c [#369] pull request: new page 2015-02-02 20:44:57 +05:00
Alexander Machehin dc2e0114b0 [#446] only admin can share a project 2015-01-26 18:52:09 +05:00
Vokhmin Alexey V cba5ff2d5e #446: cleanup, added specs for Project#fork 2015-01-14 23:56:26 +03:00
Vokhmin Alexey V 8cd175c840 #446: updated UI, logic 2015-01-14 02:17:23 +03:00
Vokhmin Alexey V 8580b9a80d #446: added ability to create project aliases 2015-01-13 02:06:33 +03:00
Alexander Machehin 6215d14657 [#369] issue page: fix undefined method 'id' for nil:NilClass 2014-12-25 18:30:45 +05:00
Alexander Machehin a37616b352 [#369] pull request page; in progress 2014-12-24 23:41:13 +05:00
Alexander Machehin ab0a57d6b2 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/models/build_list.rb
	app/models/build_list/package.rb
	app/models/build_script.rb
	app/models/product_build_list.rb
	app/models/project_tag.rb
	app/views/projects/build_lists/_filter.html.haml
2014-12-18 15:07:27 +05:00
Alexander Machehin 9cc4e2d27c [#369] pull request page: discussion tab 2014-12-18 14:59:02 +05:00
Alexander Machehin c8db1109d3 build lists api: add new filters 2014-12-09 20:33:27 +05:00
Alexander Machehin 72992a5dcd fix error in api - get a list build lists for a project 2014-12-09 18:32:55 +05:00
Alexander Machehin 8d9ec48ff9 [#369] project issue page: comments and so on 2014-12-04 22:11:50 +05:00
Vokhmin Alexey V 676b703109 #369: Fixed: missed variables at recreate action 2014-12-02 01:44:11 +03:00
Alexander Machehin e21ce73e89 [#369] issue page: status, many fixes; remove old code 2014-12-02 01:34:16 +05:00
Alexander Machehin cad69483d0 [#369] show issue page: in progress 2014-11-28 23:36:24 +05:00
Alexander Machehin 85a9eb6484 [#369] new issue page; small fixes 2014-11-28 18:28:08 +05:00
Alexander Machehin 5a2c4896ad [#369] new issue page: labels; small fixes 2014-11-27 23:55:03 +05:00
Alexander Machehin 4ffa696ef3 [#369] fix project issues page 2014-11-27 16:23:17 +05:00
Alexander Machehin 975ae2e314 [#369] update a project issues/pull_requests page 2014-11-27 16:15:00 +05:00
Alexander Machehin c6c4a9628b [#369] update project pull requests page 2014-11-27 14:42:32 +05:00
Vokhmin Alexey V b57dbb1a90 #369: updated UI for PullRequests#index 2014-11-27 02:31:35 +03:00
Vokhmin Alexey V 5a8c3430e8 update a access rights for creation/build of build_lists 2014-11-26 23:27:54 +03:00
Alexander Machehin 40cdd40acf [#369] new issue title 2014-11-26 19:24:52 +05:00
Alexander Machehin 66efa2e3fc [#369] fix project issues page for an anonymous user 2014-11-25 15:05:33 +05:00
Vokhmin Alexey V 55fad54108 #369: fixed: undefined method id for nil:NilClass: 2014-11-25 01:19:29 +03:00