Commit Graph

6623 Commits

Author SHA1 Message Date
Alexander Machehin dabab0561d use rails-assets-notifyjs gem from rails-assets.org 2015-03-20 15:07:35 +05:00
Alexander Machehin cc5c009ff7 fix mistype 2015-03-19 23:47:43 +05:00
Alexander Machehin 5c8c6ed196 repository projects: ajax remove project + flash 2015-03-19 22:24:54 +05:00
Alexander Machehin 0911103ea1 show server status only on index pages 2015-03-18 20:54:07 +05:00
Alexander Machehin 10c28be905 add comments to commit 2015-03-18 20:49:10 +05:00
Alexander Machehin ed00ea0752 project build lists page: fix mistype 2015-03-18 20:37:36 +05:00
avm cc5260800d Merge pull request #467 from abf/rosa-build:improve_monitoring_page
monitoring page
2015-03-18 19:15:48 +04:00
Alexander Machehin e8d1594b80 update server status again 2015-03-18 19:58:25 +05:00
Alexander Machehin b4319f6a84 update server status 2015-03-18 19:51:25 +05:00
Alexander Machehin 7a7844b423 show a server status only on the index page 2015-03-18 16:41:37 +05:00
Alexander Machehin eac252829f Merge branch 'master' into improve_monitoring_page 2015-03-18 16:30:31 +05:00
Alexander Machehin 691d74a8dd change a server status rendering 2015-03-18 16:29:26 +05:00
Alexander Machehin 7f9d8f77da Merge branch 'master' of abf.rosalinux.ru:abf/rosa-build 2015-03-18 16:05:38 +05:00
Alexander Machehin be43b4a379 user/group profile page: fix dropdown menu 2015-03-18 16:04:37 +05:00
Alexander Machehin ad01754ebf monitoring page: fix DatePicker 2015-03-18 15:34:16 +05:00
Alexey Vokhmin 27e9c71796 Updated README.md 2015-03-18 02:03:19 +04:00
Alexander Machehin 9d27cbb625 Merge branch 'master' of abf.rosalinux.ru:abf/rosa-build 2015-03-17 23:27:56 +05:00
Alexander Machehin 2175a898be fix preview 2015-03-17 23:27:11 +05:00
Alexander Machehin e726eb842f [#369] improve the monitoring page 2015-03-17 22:43:03 +05:00
Vokhmin Alexey V 35cf06d403 Fixed: showing of flash messages 2015-03-12 22:36:13 +03:00
Alexander Machehin 3004074e2e downgrade simple_form because bootstrap 3 2015-03-12 19:33:15 +05:00
Alexander Machehin aed389a7ad Merge branch 'master' of abf.rosalinux.ru:abf/rosa-build 2015-03-12 15:57:36 +05:00
Alexander Machehin 59cca17abc add GL_REPO_NAME variable to the pull request 2015-03-12 15:56:51 +05:00
avokhmin 14f3091b49 Merge pull request #464 from abf/rosa-build:463-increase-life-time-for-mass-builds
#463: Increased life time for builds of mass builds
2015-03-11 23:29:00 +04:00
avm e57f221002 Merge pull request #462 from abf/rosa-build:rails-4.1.9
Update rails to 4.1.9
2015-03-11 15:40:24 +04:00
Vokhmin Alexey V 86e39e978c Fixed: undefined method #find_or_initialize_by_provider_and_uid 2015-03-11 14:37:10 +03:00
Alexander Machehin b5592fd695 Merge branch 'master' into rails-4.1.9 2015-03-11 16:23:40 +05:00
Alexander Machehin fd75e0ffcc change GL_REPO_PATH -> GL_REPO_NAME 2015-03-11 16:07:14 +05:00
Alexander Machehin 5b0d149275 fix error with grack 2015-03-11 15:53:41 +05:00
Alexander Machehin c72fd6f4e8 Merge abf.rosalinux.ru:abf/rosa-build 2015-03-11 15:11:41 +05:00
Alexander Machehin e2671babf5 add ENV variable for the post-receive hook 2015-03-11 15:11:07 +05:00
Vokhmin Alexey V e599be5828 #463: Increased life time for builds of mass builds 2015-03-11 02:43:58 +03:00
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
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