Pavel Chipiga
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02:00
Pavel Chipiga
159ef26b38
Merge branch 'master' into 3.2-master
...
Conflicts:
app/views/wiki/_compare.html.haml
app/views/wiki/_diff_data.html.haml
db/schema.rb
2012-02-27 22:32:57 +02:00
Pasha
ab2398de53
Merge pull request #222 from warpc/221-delete_product_build_list
...
[Refs #221 ] Delete product build lists (only in web)
2012-02-27 12:11:06 -08:00
Vladimir Sharshov
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
Vladimir Sharshov
b475877608
Merge pull request #216 from warpc/193-new_design_for_wiki
...
[Refs #193 ] new design for wiki
2012-02-27 11:12:28 -08:00
Pavel Chipiga
0579fe9b47
Merge branch '3.2-master' into 193-new_design_for_wiki
...
Conflicts:
app/assets/stylesheets/application.scss
app/views/layouts/application.html.haml
2012-02-27 21:04:10 +02:00
Pavel Chipiga
7508bb1339
Fix bugs to force new design work. Minor refactor and improvements. Refs #193
2012-02-27 20:58:37 +02:00
Vladimir Sharshov
9b02b97f2c
Merge pull request #220 from warpc/219-pbl_container
...
[Fix #219 ] Add link to product container
2012-02-27 08:29:25 -08:00
Pavel Chipiga
1005fbd64f
Add link to product container. Refs #217
2012-02-27 18:21:56 +02:00
Vladimir Sharshov
3715331021
Merge pull request #218 from warpc/217-product_abilities
...
[Fix #217 ]
* Add local admin ability to build product
* Fix template links
* Refactor
2012-02-27 05:58:58 -08:00
Pavel Chipiga
e1f7817624
Add local admin ability to build product. Fix template links. Refactor. Refs #217
2012-02-27 15:49:24 +02:00
Pavel Chipiga
1dd20377cf
Fix layout. Refs #193
2012-02-24 23:54:44 +02:00
Pavel Chipiga
4d2459c60c
Refactor, fix and cleanup wiki templates and translations. Refs #193
2012-02-24 23:39:40 +02:00
George Vinogradov
3c83649627
[issue #96 ] Some fixes in layout and scripts.
2012-02-24 23:39:40 +02:00
George Vinogradov
586d4e0bea
Fixed bug with Windows line endings in blob editing.
2012-02-24 20:34:41 +04:00
Pavel Chipiga
482874409d
Force bluepill restart after deploy. Refs #196
2012-02-24 17:28:46 +02:00
Pavel Chipiga
bda978a306
Fix bug with group autocomplete. Do not delete during rsync
2012-02-24 17:27:49 +02:00
Pavel Chipiga
dde34cdffb
Fix build_for settings. Refs #207
2012-02-23 22:20:44 +02:00
Vladimir Sharshov
fb2b9f882c
Merge pull request #215 from warpc/207-platform_clone_bg
...
Refs #207 . Redo platform build_all with sleep and errors rescue
2012-02-23 11:09:37 -08:00
Pavel Chipiga
86c717dee5
Build only main repo. Refs #207
2012-02-23 21:06:28 +02:00
Pavel Chipiga
66fc31e404
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-23 20:32:56 +02:00
Vladimir Sharshov
c1224567e3
Merge pull request #213 from warpc/207-platform_clone_bg
...
[Refs #207 ]
* Rescue and ignore timeout error during long XML RPC
* Apply add_branch script
2012-02-23 07:57:21 -08:00
Pavel Chipiga
a2a29e2baa
Rescue and ignore timeout error during long XML RPC. Apply add_branch script. Refs #207
2012-02-23 17:17:02 +02:00
Vladimir Sharshov
e3c6a23eb6
Merge pull request #212 from warpc/207-platform_clone_bg
...
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-22 15:02:44 -08:00
Pavel Chipiga
b192ebdcea
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-23 00:57:43 +02:00
Vladimir Sharshov
accce3e7be
Merge pull request #211 from warpc/207-platform_clone_bg
...
[Refs #207 ]
* Redo clone logic
* Split clone process for repositories
* Optimize and refactor
2012-02-22 12:32:29 -08:00
Pavel Chipiga
9eb191da7b
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-22 22:24:29 +02:00
Vladimir Sharshov
0cf3c0a265
Merge pull request #210 from warpc/207-platform_clone_bg
...
[Refs #207 ] Place relations clone and XML RPC to background:
* Place platform destroy to background
* Redo clone process to 2 phases - base_clone and relations_clone
* Remove unneeded validations
* Refactor xml_rpc_clone
2012-02-22 04:48:22 -08:00
Pavel Chipiga
8f4c207545
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-22 14:35:40 +02:00
konstantin.grabar
b99a7d5aa9
[refs #193 ] Move wiki locales to another file
2012-02-22 16:11:40 +04:00
Vladimir Sharshov
39f9e98d04
Merge pull request #209 from warpc/207-platform_clone_bg
...
[Refs #207 ] Place XML RPC clone request to DJ
Refactor platform clone controller and routes
Refactor and fix clone process for platform, repository, product
2012-02-21 13:44:49 -08:00
Pavel Chipiga
5829ab87e9
Remove raise. Refs #207
2012-02-21 23:43:06 +02:00
Pavel Chipiga
5b29de93af
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-21 23:27:11 +02:00
Vladimir Sharshov
a249e566ac
Merge pull request #206 from warpc/205-repo_abilities
...
Refs #205
Delegate all repo abilities to platform
Remove repository owner and relations
Fix templates and specs
Refactor and code cleanup
2012-02-21 12:49:24 -08:00
konstantin.grabar
3a48f8dea9
[refs #193 ] Add lost file with wiki_history checkboxes script
2012-02-21 20:11:16 +04:00
konstantin.grabar
81393d7f5b
[refs #193 ] Disable more than 2 versions for wiki diff by js
2012-02-21 16:42:09 +04:00
konstantin.grabar
9b610eb920
[refs #193 ] Fixed old commented code from old template versions. Fix diff page
2012-02-21 14:49:06 +04:00
Pavel Chipiga
ed60751dfa
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-21 01:13:05 +02:00
konstantin.grabar
2bdcdb6fd3
[refs #193 ] Fix compare buttons and links design
2012-02-20 14:27:58 +04:00
konstantin.grabar
f22d9809ff
[refs #193 ] Remove debug puts from wiki controller
2012-02-20 14:02:04 +04:00
konstantin.grabar
2b675c6f84
[refs #193 ] Fix routes regex for wiki compare
2012-02-20 13:56:09 +04:00
Vladimir Sharshov
f6f7d1fb87
Merge pull request #201 from warpc/196-dj_old
...
[Refs #196 ] Refactor bluepill deploy recipies. Restart DJ through bluepill.
2012-02-17 07:53:40 -08:00
Pavel Chipiga
3347a74653
Refactor bluepill deploy recipies. Restart DJ through bluepill. Refs #196
2012-02-17 16:32:03 +02:00
konstantin.grabar
d9025b093f
[refs #193 ] Compare routes repair and compare design
2012-02-17 18:12:05 +04:00
konstantin.grabar
7863869a30
[refs# 193] Move some gollum style to docs/gollum. Add new styles to edit and new pages
2012-02-17 16:47:33 +04:00
Vladimir Sharshov
ece7051e1b
Merge pull request #199 from warpc/134-lost_env
...
[refs #134 ] Refactoring git-hooks scripts
2012-02-17 03:50:15 -08:00
konstantin.grabar
d8a3983b07
[refs #193 ] Add new design to wiki
2012-02-17 15:13:54 +04:00
Alexander Machehin
c55158a892
[refs #134 ] some hook task improvements
2012-02-17 15:22:55 +06:00
George Vinogradov
608faf3564
[issue #96 ] Some fixes in layout and scripts.
2012-02-17 03:07:22 +04:00
Vladimir Sharshov
3d7b6ea9d6
[Refs#196] Update text message for empty text[en]
2012-02-16 23:10:58 +04:00