Commit Graph

497 Commits

Author SHA1 Message Date
Alexander Machehin 2175a898be fix preview 2015-03-17 23:27:11 +05:00
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 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 13cd263855 #456: add integration with Group#default_branch, specs 2015-02-20 01:03:04 +03:00
Alexander Machehin 516a7a3df9 [#369] project settings: fix a maintainer autocomplete 2015-02-11 15:32:55 +05:00
Alexander Machehin a1fae2f1b1 [#369] new pull request: fix a 'To project' typehead 2015-02-10 16:57:16 +05:00
Alexander Machehin 424927dd89 [#369] new pull: autoselect project 2015-02-04 23:33:24 +05:00
Alexander Machehin 79dbe762e5 [#369] fix double render 2015-02-02 23:21:28 +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 9cc4e2d27c [#369] pull request page: discussion tab 2014-12-18 14:59:02 +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
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
Alexander Machehin 6358a0e87f [#369] project issues page: labels 2014-11-25 01:38:09 +05:00
Alexander Machehin 9dcd42425d [#369] project issues index page: labels filter 2014-11-21 16:26:21 +05:00
Alexander Machehin 577475da9d [#369] project issues page 2014-11-21 00:49:50 +05:00
Alexander Machehin 9113373ee1 Merge branch '369-bootstrap' of abf.rosalinux.ru:abf/rosa-build into 369-bootstrap 2014-11-20 22:41:05 +05:00
Alexander Machehin fdf60fb754 [#369] project issues page: in progress 2014-11-20 22:40:50 +05:00
Vokhmin Alexey V 753995581a #369: updated UI of WIKI 2014-11-20 01:51:49 +03:00
Vokhmin Alexey V d1116e70db #369: updated UI for mass import 2014-11-18 23:45:03 +03:00
Alexander Machehin 2a5ec70a6b [#369] project collaborators page: in progress 2014-11-15 01:36:39 +05:00
Vokhmin Alexey V 362477fadd #369: remove layouts/application.html.haml 2014-11-14 00:41:07 +03:00
Alexander Machehin e4aeaee9aa [#369] project hook pages 2014-11-12 23:45:28 +05:00
Alexander Machehin f4eb6de8b0 [#369] project sections page 2014-11-12 22:30:27 +05:00
Alexander Machehin bc0b196319 [#369] edit project page 2014-11-12 22:07:39 +05:00
Alexander Machehin efbde056e0 [#369] new project page 2014-11-11 21:59:49 +05:00
Alexander Machehin 27f3d371a6 [#369] blob; hightlight a line; 2014-11-10 23:46:44 +05:00
Vokhmin Alexey V 90f6bca72d Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile.lock
	app/models/concerns/feed/git.rb
	app/models/issue.rb
2014-11-08 01:09:32 +03:00
Vokhmin Alexey V 16808549ab #369: updated UI for BuildListsController#dependent_projects 2014-11-06 23:34:16 +03:00
Alexander Machehin 8c8d86788c [#369] fix layout for a new build list page 2014-11-06 12:59:56 +05:00