Commit Graph

322 Commits

Author SHA1 Message Date
Alexander Machehin a316105e9c Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-07 18:21:04 +06:00
Vladimir Sharshov c310d3cfec [refs #604] Fix schema 2012-08-07 01:11:46 +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
George Vinogradov b963c9342a [issue #590] Repository fetches through project and platform 2012-08-06 14:59:07 +04:00
George Vinogradov 2fe615047e [issue #590] Removed debug output from migration 2012-08-06 14:30:52 +04:00
George Vinogradov 36de270fad [issue #590] Moved repository check to controller. 2012-08-06 14:21:33 +04:00
George Vinogradov 623ce0cefb [issue #590] Migration debug 2012-08-06 13:11:34 +04:00
Alexander Machehin 6a04f4ad7a Merge again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-06 11:19:06 +06:00
George Vinogradov d407433f45 [issue #590] Attempt to speed up migration. 2012-08-04 00:25:41 +04:00
George Vinogradov e57da721de [issue #590] Attempt to speed up migration. 2012-08-04 00:18:41 +04:00
George Vinogradov 877007eb8d [issue #590] Added missed migration 2012-08-03 23:16:56 +04:00
George Vinogradov 6eff6bffa5 [issue #590] Merge branch 'master' into 590-build_list_page_change
Conflicts:
	db/schema.rb
2012-08-03 18:37:44 +04:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
Pavel Chipiga b6c5221f41 Rollback schema.rb. Refs #263 2012-08-01 00:38:21 +03:00
Pavel Chipiga 8e91159b5b Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263 2012-07-31 20:32:49 +03:00
konstantin.grabar ebc5cd2603 [refs #441] Fix schema 2012-07-31 17:35:05 +04:00
konstantin.grabar f7f848e878 [refs #441] Merge master into 441-key_pairs 2012-07-31 17:16:07 +04:00
konstantin.grabar 0305976a27 [refs #441] Fix schema 2012-07-31 12:56:55 +04:00
Vladimir Sharshov 43309d86e6 Merge branch 'master' into 441-key_pairs, fix schema, add migration
Conflicts:
	db/schema.rb
2012-07-31 02:02:15 +04:00
Vladimir Sharshov 89d67f9ea6 [refs #441] Refactring, fix errors 2012-07-30 23:08:14 +04:00
konstantin.grabar 844e81a73d [refs #441] Change public key type 2012-07-30 19:25:51 +04:00
George Vinogradov cc66e2ee4a [issue #590] Save repository to save to in BuildList. 2012-07-27 20:01:26 +04:00
konstantin.grabar 33e6cdc285 [refs #570] Remove mass build counters logs and transactions 2012-07-27 19:17:07 +04:00
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
konstantin.grabar f9b217379d [refs #570] Add mass build counters logs 2012-07-26 15:45:23 +04:00
Pavel Chipiga e09a9467e2 Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576 2012-07-25 21:05:25 +03:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
konstantin.grabar b4059c67fc [refs #441] Add key pairs for platform 2012-07-13 15:18:12 +04:00
Alexander Machehin 10b828c644 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
	vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
George Vinogradov a909a92ae8 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	db/schema.rb
2012-07-04 18:10:03 +04:00
konstantin.grabar 2353a65972 [refs #442] Repair schema 2012-07-04 16:53:44 +04:00
George Vinogradov e00e88340b [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
2012-07-04 03:31:51 +04:00
Alexander Machehin 89abd20c95 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar 6afe8c0375 [refs #442] Merge master into 442-mass_build 2012-07-03 18:41:02 +04:00
Pavel Chipiga b46a7aba39 Fix branch with dots. Refs #263 2012-07-03 15:05:27 +03:00
konstantin.grabar dbbe4cef1f [refs #442] Slice counters migration on two parts 2012-07-03 14:24:14 +04:00
konstantin.grabar 561ebb8728 [refs #442] Add stop_build field 2012-06-29 19:17:25 +04:00
konstantin.grabar 6507ad280f [refs #442] Merge master into 442-mass_build 2012-06-29 16:40:54 +04:00
Vladimir Sharshov 7561abca08 [refs #462] refactoring: remove notified_at 2012-06-28 21:40:32 +04:00
konstantin.grabar ce163f89a9 [refs #442] Add rep_name field. Add cancel builds ability 2012-06-28 19:23:33 +04:00
konstantin.grabar b6d769ad66 [refs #442] Change mass builds table 2012-06-27 18:07:05 +04:00
Alexander Machehin 1ffb1b3940 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/models/project.rb
	db/schema.rb
2012-06-27 16:20:38 +06:00
konstantin.grabar fc00f713b5 [refs #442] Add counters update checking. Add build_error counter 2012-06-27 13:48:54 +04:00
konstantin.grabar f3bd3bbd7f [refs #442] Add mass build counters ant their update. Add failed builds report generate 2012-06-22 19:10:44 +04:00
George Vinogradov 60f1f68ce1 [issue #428] Fixed schema.rb . Removed debug code. 2012-06-20 00:04:33 +04:00
George Vinogradov 735afaea15 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	db/schema.rb
2012-06-19 02:57:39 +04:00
George Vinogradov ecd4498484 [issue #428] Changes in advisories.
*  Added Many2Many relation between advisories and projects.
*  Added autocompletion to build list's advisory
*  Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
Pavel Chipiga b47b4ec075 Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510 2012-06-16 21:27:46 +03:00
konstantin.grabar 8eaec85aff [refs #442] Fix auto_publish validate and default set 2012-05-29 17:44:30 +04:00