Commit Graph

2791 Commits

Author SHA1 Message Date
Alexander Machehin b2ff7326d1 Merge branch 'master' into 90-pull
Conflicts:
	config/locales/en.yml
	config/locales/ru.yml
2012-08-13 15:01:43 +06:00
George Vinogradov 8c07e5a516 [issue #590] Fixed bug in JS timeparser. 2012-08-11 22:46:39 +04:00
Alexander Machehin ab939253df [refs #90] optimization? 2012-08-10 23:06:34 +06:00
Alexander Machehin 11e5f4dd99 [refs #90] try use grit to clone 2012-08-10 22:42:34 +06:00
Alexander Machehin c1c9f9680e [refs #90] remove code duplication 2012-08-10 22:40:09 +06:00
Vladimir Sharshov e535ff2fed Merge pull request #611 from warpc/590-build_list_page_change
[refs #590] Dirty hack to fix BuildList#index
2012-08-10 09:26:11 -07:00
George Vinogradov 9030056c1b [issue #590] Changed _build_list partial. 2012-08-10 20:14:45 +04:00
George Vinogradov e7407ae28f [issue #590] Dirty hack to fix BuildList#index 2012-08-10 19:08:26 +04:00
Vladimir Sharshov f7b61ec154 Merge branch 'master' of github.com:warpc/rosa-build 2012-08-10 18:52:50 +04:00
Vladimir Sharshov 5759a53fae Temporarily transfer path for the git repository via NFS 2012-08-10 18:50:30 +04:00
Vladimir Sharshov 45169faf2f Merge pull request #609 from warpc/590-build_list_page_change
[refs #590] add time notification and periodic page update
2012-08-09 14:49:12 -07:00
George Vinogradov cc1a076516 [issue #590] Fixed translations. 2012-08-10 00:24:36 +04:00
Alexander Machehin 1d5470b7d6 [refs #90] small fixes 2012-08-09 23:56:55 +06:00
Vladimir Sharshov d8da0d8c60 Inform the kernel about project git address(part 3): add protocol 2012-08-09 20:46:09 +04:00
George Vinogradov e5e8cc7e7f [issue #590] Changed time representation.
*  Removed buggy jquery.countdown plugin
  *  Page reloads every minute
2012-08-09 20:39:01 +04:00
Vladimir Sharshov d195ef3aad Inform the kernel about project git address(part 2) 2012-08-09 18:11:20 +04:00
Vladimir Sharshov f4b3c53362 Inform the kernel about project git address 2012-08-09 17:56:45 +04:00
George Vinogradov 7961bd5fc1 [issue #590] Added missed style. 2012-08-09 01:19:43 +04:00
George Vinogradov 5cb2853c66 [issue #590] Added timers to BuildList index page. 2012-08-09 01:10:39 +04:00
Alexander Machehin 818698f320 Merge branch 'master' into 90-pull
Conflicts:
	lib/tasks/import.rake
2012-08-09 00:16:36 +06:00
Alexander Machehin ec7d132a3f [refs #90] fixed update commits button 2012-08-08 23:57:03 +06:00
Alexander Machehin 9bf2f728a7 [refs #90] change new action from post to get 2012-08-08 23:21:49 +06:00
Alexander Machehin 3641b187bc [refs #90] fixed locales 2012-08-08 21:57:33 +06:00
Alexander Machehin 910aac939e [refs #90] fixed changing tabs & anchors 2012-08-08 21:47:58 +06:00
Alexander Machehin 4c02d4be19 [refs #90] fixed error 2012-08-08 16:33:48 +06:00
Vladimir Sharshov 0eb85654d5 Merge pull request #608 from warpc/112-import
[refs #112] Add srpm release to version comparison and commit message. Redo logging to simplify parsing.
2012-08-07 13:29:38 -07:00
Pavel Chipiga 6dad9d8804 Add srpm release to version comparison and commit message. Redo logging to simplify parsing. Refs #112 2012-08-07 23:23:30 +03:00
Alexander Machehin 0ddb960b8b [refs #90] remove commits from pull refs 2012-08-08 00:23:17 +06:00
Alexander Machehin edf882f2a1 [refs #90] remove unneeded method 2012-08-08 00:17:10 +06:00
Alexander Machehin 5cb1f4e7e9 [refs #90] small delegate refactoring 2012-08-08 00:08:02 +06:00
Alexander Machehin a7f926bbdf [refs #90] forgot dependent destroy 2012-08-08 00:07:26 +06:00
Alexander Machehin 6225410720 [refs #90] enable check for uniq pull requests 2012-08-08 00:06:49 +06:00
Alexander Machehin 61b02ce1e8 [refs #90] fixed error on create 2012-08-08 00:05:43 +06:00
Alexander Machehin 37a0b4efe8 [refs #90] fixed error with / in branch name 2012-08-07 23:40:40 +06:00
Alexander Machehin b50d9f87d2 [refs #90] clean ability 2012-08-07 23:07:18 +06:00
Alexander Machehin ea930308df [refs #90] small pull helper refactoring 2012-08-07 23:02:58 +06:00
Alexander Machehin 7a16bac06a [refs #90] fixed error after merging with master 2012-08-07 22:35:15 +06:00
Alexander Machehin e97c3dc645 [refs #90] small controller refactor 2012-08-07 22:34:22 +06:00
Alexander Machehin 2a6b08c269 [refs #90] fixed error with wrong treeish 2012-08-07 22:24:47 +06:00
Alexander Machehin 35642102dd [refs #90] fixed show merge button 2012-08-07 19:25:08 +06:00
Alexander Machehin a316105e9c Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-07 18:21:04 +06:00
Alexander Machehin 963b80cc93 Merge pull request #605 from warpc/#604-Remove_old_buildlist_created_more_than_3_month_ago
#604 remove outdated buildlists
2012-08-07 02:07:21 -07:00
George Vinogradov 61ca25a820 [issue #590] Eager loading of BuildList's owner and repository. 2012-08-07 01:41:57 +04:00
Vladimir Sharshov ffb6d5964e [refs #604] Fix typo 2012-08-07 01:15:55 +04:00
Vladimir Sharshov c310d3cfec [refs #604] Fix schema 2012-08-07 01:11:46 +04:00
Vladimir Sharshov 30efe134ef [refs #604] Remove old and empty mass builds 2012-08-07 01:07:54 +04:00
Vladimir Sharshov f35d4cd873 Merge branch 'master' into #604-Remove_old_buildlist_created_more_than_3_month_ago
Conflicts:
	app/models/project.rb
	db/schema.rb
2012-08-07 00:53:43 +04:00
Vladimir Sharshov 69fb368911 merger stash 2012-08-07 00:48:29 +04:00
Vladimir Sharshov 38aa39743a [refs #590] Fix mass build(part 2) 2012-08-07 00:22:16 +04:00
Vladimir Sharshov 8e1475ca7d Merge branch 'master' of github.com:warpc/rosa-build 2012-08-07 00:05:20 +04:00