28f539f0b4
#757 : update BuildList validation
2013-02-21 18:46:52 +04:00
219ef67699
#757 : add filter by save_to_platform_id in #autocomplete method
2013-02-21 18:28:54 +04:00
46a5b8daad
#757 : enable extra containers and repositories for main platforms
2013-02-21 18:21:58 +04:00
3902a78e37
#921 refactoring per page
2013-02-21 18:46:28 +06:00
3dda72a0ac
Merge branch 'master' into 921-task-monitoring
...
Conflicts:
app/assets/javascripts/extra/build_list.js
2013-02-21 00:54:04 +06:00
e5db61197e
[refs #921 ] add new filter to the build list monitoring
2013-02-20 21:07:11 +06:00
65b98a2d00
#757 : update name of methods, API
2013-02-19 19:22:38 +04:00
c4113c11fb
#757 : add checking ability with "accessible_by"
2013-02-19 18:52:02 +04:00
5234b7cc51
#757 : create "published_container" scope
2013-02-19 18:14:51 +04:00
61e9d24bb5
#757 : add validation for new fields
2013-02-19 12:31:01 +04:00
e9fa6e860d
#757 : update #autocomplete_to_extra method
2013-02-18 21:04:22 +04:00
9ecd26885b
#757 : find build_list with container
2013-02-18 20:53:54 +04:00
4604ceb318
#757 : some refactoring of styles
2013-02-18 20:10:34 +04:00
20691dabc5
#757 : add migration, update UI, JS
2013-02-18 19:43:30 +04:00
0c28ddb5b5
Merge pull request #930 from warpc/907-save-project-tags-on-file-store
...
[refs #907 ]: save project tags archives on file store
2013-02-15 05:01:39 -08:00
befbf7e85a
#899 : hot fix
2013-02-15 16:00:34 +04:00
69d384412e
#899 : update #init_statistics method, refactoring
2013-02-15 15:57:00 +04:00
0c6cc8afc8
#899 : small refactoring
2013-02-15 15:16:34 +04:00
7bcbe39e61
#907 : update "FileStoreClean" module, some refactoring
2013-02-15 01:49:18 +04:00
c6aa58c063
Merge branch 'master' into 907-save-project-tags-on-file-store
2013-02-14 17:15:16 +04:00
5c286a6aa0
#907 : add ProjectTags table, update UI, logic
2013-02-14 16:46:25 +04:00
934cb8fbb8
[refs #907 ] fixed 404 in branch with dots
2013-02-14 12:55:56 +06:00
7fc8e33993
#907 : small refactoring of UI
2013-02-13 23:29:08 +04:00
58ac925368
#907 : refactoring #tags && #branches views
2013-02-13 21:40:16 +04:00
2a3fb08a89
#907 : "skip_before_filter authenticate_user!" for #tags and #branche
2013-02-13 15:42:24 +04:00
f97fb4c4a5
#907 : show only tags with commit
2013-02-13 15:38:25 +04:00
c762d2b6e0
#907 : update #tags action
2013-02-13 15:23:58 +04:00
3929c4bb57
#907 : update #branches UI
2013-02-13 14:25:09 +04:00
77d3a01614
#907 : add #branches, #tags actions
2013-02-12 20:35:14 +04:00
f3033caac4
Merge pull request #879 from warpc/878-fix_bugs_with_git_without_master
...
[refs #878 ] Fix varios errors with missing default git branch what set in project settings.
2013-02-01 05:53:46 -08:00
7185a46ed7
[refs #878 ] fixed ActionController::RoutingError (Not Found) for archives
2013-01-31 23:26:41 +06:00
8860238da4
[refs #878 ] fix some bugs when no master branch
2013-01-31 22:26:49 +06:00
3fab64813e
#859 : update specs, API for build_list
2013-01-31 00:04:19 +04:00
fed1c76ca2
#860 : update logic for creating build list container
2013-01-28 18:44:06 +04:00
f4c3d23d7c
create container for BuildList
2013-01-25 21:24:46 +04:00
bf445d9e5e
Merge pull request #850 from warpc/848-add-status-information-for-product-build-lists
...
[refs #848 ]: add status information about servers for ProductBuildLists
2013-01-25 03:37:41 -08:00
b46c1e963f
#848 : update StatusInspector, UI
2013-01-24 14:42:03 +04:00
1873f9cd49
[refs #847 ] remove core callbacks
2013-01-24 15:41:18 +06:00
0d9c095cbd
[refs #847 ] remove old core code
2013-01-24 12:33:16 +06:00
86034c5da4
#843 : update pages for using only new_core
2013-01-21 19:52:20 +04:00
318007751c
#839 : enable new_core for all platforms
2013-01-17 14:46:51 +04:00
43d1c29d46
fix RegexpError: premature end of char-class
2012-12-25 15:46:07 +06:00
ac762388a4
#800 : enable "new_core" for personal platforms
2012-12-24 16:35:29 +04:00
e3e228de33
#759 : add tester role for user
2012-12-06 22:04:39 +04:00
ab8c4016b5
#759 : refactoring according to Vladimir's comments
2012-12-06 21:34:09 +04:00
ff2ae73985
#759 : add action for cancel build, some refactoring
2012-12-06 18:41:24 +04:00
3432b6af49
[refs #674 ] change comments
2012-12-04 00:06:31 +06:00
b132a56937
Merge branch 'master' into 674-diff_between_commits
...
Conflicts:
db/schema.rb fresh
2012-12-04 00:02:45 +06:00
ee73df5d3a
disable auto_publish for new_core, some refactoring
2012-12-03 15:28:27 +04:00
611402c4c2
[refs #674 ] add stats
2012-12-03 17:11:55 +06:00
fcdbfd4538
add new column to build_lists table, some refactoring
2012-11-30 14:41:39 +04:00
a5daff3442
update getting logs, some repo generation
2012-11-29 21:56:03 +04:00
791f77dfd5
add 'New core' option for creating build_list
2012-11-29 19:12:24 +04:00
8ed71e0f03
[refs #674 ] fixed undefined method 'binary?' for nil:NilClass when rename the file
2012-11-27 23:35:58 +06:00
96e8df1b50
use Redis for getting log
2012-11-26 22:16:34 +04:00
7be2df7578
[refs #674 ] first step of the diff between commits
2012-11-20 01:15:15 +06:00
95d262b92f
fix build list pagination
2012-11-14 23:56:00 +06:00
8df87ed292
[refs #90 ] fixed error on create
2012-11-14 16:51:10 +06:00
26af1aa27c
Merge branch 'master' into 90-fix_orphan_pulls
...
Conflicts:
app/models/pull_request.rb
2012-11-09 20:53:55 +06:00
58a9c68951
[refs #90 ] fixed rendering a new pull
2012-10-28 00:44:42 +06:00
95e5804358
[refs #90 ] fixed git timeout error on the big diff
2012-10-26 20:03:46 +06:00
00e92d9672
Merge pull request #678 from warpc/579-code_line_comments
...
[refs #579 ] code line comments
2012-10-19 07:48:50 -07:00
0cf0933074
#698:small refactoring
2012-10-19 11:32:12 +04:00
68dbae8c83
#698 : added #create and #fork actions for Advisories API
2012-10-18 18:17:50 +04:00
c6f45956cc
[refs #90 ] fixed error by 24fd99b2d5cab
2012-10-18 18:50:43 +06:00
e15bf13c4f
[refs #90 ] small refactoring of the diff method
2012-10-18 18:09:12 +06:00
62ca030110
[refs #90 ] head_branch -> from_branch
2012-10-18 17:46:57 +06:00
f060d919d9
[refs #579 ] add new helper
2012-10-16 19:20:55 +06:00
9579734506
[refs #579 ] some optimization by getting pull repo
2012-10-16 16:19:53 +06:00
b0604f89d1
[refs #579 ] move logick to model
2012-10-16 15:50:21 +06:00
938a8a0ad1
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/views/projects/pull_requests/_pull_diff.html.haml
app/views/projects/wiki/_diff_data.html.haml
2012-10-16 00:19:22 +06:00
b9d69a966b
[refs #579 ] add 404 for wrong commit hash
2012-10-13 01:59:14 +06:00
c5d6707b8f
[refs #579 ] fixed commit comments errors
2012-10-13 01:57:54 +06:00
993454fc29
[refs #579 ] alpha version of the pull discussion
2012-10-11 23:50:40 +06:00
7f031ac688
[refs #374 ] added commit validation
2012-10-11 22:11:53 +06:00
e379a603b4
[refs #90 ] get new pull to this project
2012-10-11 00:59:25 +06:00
e7cd5f008a
Revert "[refs #579 ] save additional info for pull inline comments"
...
This reverts commit 0de497c30f15720ae3b2f31c19e7ed2fdc390ad2.
Conflicts:
app/controllers/projects/comments_controller.rb
2012-10-09 20:15:10 +06:00
a5477926bc
[refs #579 ] fix checking path
2012-10-08 21:36:46 +06:00
fcfdf1b26b
[refs #579 ] change 'base' & 'head' -> 'to' & 'from'
2012-10-08 21:36:23 +06:00
70e8a1fe0d
[refs #579 ] unless -> if
2012-10-08 21:33:43 +06:00
21b7b0d0b1
[refs #579 ] dont create wrong comment
2012-10-08 21:31:30 +06:00
3241b7a55a
[refs #579 ] save additional info for pull inline comments
2012-10-08 20:54:36 +06:00
824ee79452
[refs #579 ] redirect to created comment
2012-10-08 15:20:45 +06:00
ed7aec602f
[refs #579 ] alpha version of the pull inline comments
2012-10-06 01:19:05 +06:00
49946f4f53
[refs #90 ] fix creating a blocked pull
2012-10-05 23:31:06 +06:00
80a91b21a9
[refs #579 ] fixed bug with new_line access
2012-10-05 18:32:56 +06:00
e085784d51
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/helpers/diff_helper.rb
app/models/ability.rb
app/views/projects/comments/_list.html.haml
app/views/projects/git/commits/_commit_diff.html.haml
lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
527dd210bf
[refs #579 ] alpha version of inline comments for commit
2012-10-05 00:40:12 +06:00
ad50934bab
#624 : fixed downloading RAW files
2012-10-04 01:20:07 +04:00
33209e7200
hotfix for downloading 'tar' archives
2012-10-04 00:27:13 +04:00
bf7bc8787a
[refs #90 ] small controller refactoring
2012-10-03 17:59:18 +06:00
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
1d424b463c
[refs #90 ] fix when creating new pull
2012-10-03 09:21:16 +06:00
b3fd95d7fa
[refs #90 ] always redirect to pull on update action
2012-10-02 21:27:15 +06:00
53b421d8e5
[refs #90 ] fixed pull ability for project writers & changing tests
2012-10-02 21:19:50 +06:00
35c965a796
[refs #90 ] add all ancestors to base project choise
2012-10-02 15:20:48 +06:00
d948949532
[refs #90 ] new pull optimization
2012-10-02 15:14:31 +06:00
f92f209323
[refs #90 ] fixed changing base project
2012-10-01 23:43:15 +06:00
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
90069b2fb6
[#refs #90 ] fix pull flashes
2012-09-28 23:45:27 +06:00
fbc537174e
[refs #90 ] search base project by fullname
2012-09-28 21:39:45 +06:00
a994e7dd74
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 23:10:45 +06:00
4100b875bd
[refs #90 ] fixed access
2012-09-26 23:10:04 +06:00
cc05fa695a
[refs #90 ] fixed pull abilities part 2
2012-09-26 23:09:29 +06:00
37fbb4632e
#90 : updated branch
2012-09-26 21:04:12 +04:00
613db04375
#90 : added limit for commits into the pull request
2012-09-26 21:00:58 +04:00
6f889b15a9
#90 : added access to show pull requests
2012-09-26 19:39:47 +04:00
37c9a906c4
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
2012-09-26 18:45:26 +04:00
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
dbf1a5f8ca
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 15:27:54 +06:00
3491492c8d
[refs #90 ] fixed pull authorization
2012-09-26 15:24:46 +06:00
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +04:00
0299c069c6
#90 : style changes for header, increase performanse for #autocomplete_base_project action
2012-09-25 19:18:22 +04:00
dfbf8a8d58
Merge branch 'master' into 90-pull
...
Fucking conflicts:
app/controllers/projects/issues_controller.rb
app/models/ability.rb
app/views/projects/issues/show.html.haml
config/routes.rb
db/schema.rb
lib/tasks/import.rake
spec/models/comment_for_commit_spec.rb
vendor/assets/javascripts/bootstrap-tab.js
vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
06099a15b6
Merge pull request #657 from warpc/648-add-filters-to-projects-page
...
[refs #648 ]: Filters by owners in projects page
2012-09-25 03:41:11 -07:00
c426f81abe
Merge pull request #656 from warpc/616-issues_and_comments
...
[refs #616 ] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
2012-09-25 03:37:44 -07:00
84378afc3d
#648 : small code optimization
2012-09-25 13:36:50 +04:00
768f4b1dfb
#648 : renamed parametr
2012-09-24 22:07:53 +04:00
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
2c6d4bae9e
[refs #616 ] add error messages to ajax
2012-09-24 23:34:14 +06:00
f4bbeaaa46
[refs #616 ] fixed 500 when failed to create comment
2012-09-24 23:01:04 +06:00
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
07f5224e76
#385 : removed before_filter
2012-09-20 15:21:54 +04:00
c76618441e
#385 : revert some changes according to discussion
2012-09-20 15:10:52 +04:00
9d2c9ae2b3
#385 : added rsa to name of archives for git branches
2012-09-20 00:38:40 +04:00
f39adfd2f7
#385 : fixed specs, updated controller, view
2012-09-19 23:29:36 +04:00
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +06:00
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06:00
a4c8e8eff8
Merge branch 'master' into 616-issues_and_comments
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
fe20814b5a
#633 : hot fix
2012-09-13 20:18:09 +04:00
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +04:00
768e40ee2a
Merge branch 'master' into 631-publish-to-the-repository-without-qa
...
Conflicts:
app/models/ability.rb
2012-09-07 16:38:21 +03:00
2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
f0f11cb9dc
#631 : added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
2012-09-06 17:43:50 +04:00
698e55e3e8
[refs #263 ] Test refactoring
2012-09-06 14:53:03 +04:00
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
decd4bf293
[issue #620 ] Removed scope from BuildList::Package && small refactoring.
2012-08-31 21:47:52 +04:00
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
6c4b13f0da
[issue #620 ] Removed project_maintainer & assignee
2012-08-28 18:25:57 +04:00
1c3ca85f03
[refs #616 ] add comment for clarity
2012-08-27 15:43:44 +06:00
2c0826a77d
[refs #616 ] fixed showing body after update
2012-08-25 23:40:51 +06:00
4b4007651d
[refs #616 ] small refactoring issues controller
2012-08-25 23:38:11 +06:00
e8d80b849a
[refs #616 ] fixed removing labels from issue
2012-08-25 21:26:24 +06:00
2fbb72e537
[issue #620 ] Changes in Maintainer db:
...
* Added maintainer selection on project page (see TODO in sources);
* Added `actual` field to BuildList::Package;
* Added rake task to set BuildList::Package.actual field.
Run it after migration (see TODO in sources);
* Packages after publising of BuildList becomes actual;
* Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
1142f9ee8c
[refs #616 ] fixed searching collaboratots to assignment
2012-08-20 23:37:22 +06:00
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
0ff8f92b62
Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263
2012-08-15 16:52:32 +03:00
b2ff7326d1
Merge branch 'master' into 90-pull
...
Conflicts:
config/locales/en.yml
config/locales/ru.yml
2012-08-13 15:01:43 +06:00
c1c9f9680e
[refs #90 ] remove code duplication
2012-08-10 22:40:09 +06:00
e7407ae28f
[issue #590 ] Dirty hack to fix BuildList#index
2012-08-10 19:08:26 +04:00
1d5470b7d6
[refs #90 ] small fixes
2012-08-09 23:56:55 +06:00
edf882f2a1
[refs #90 ] remove unneeded method
2012-08-08 00:17:10 +06:00
6225410720
[refs #90 ] enable check for uniq pull requests
2012-08-08 00:06:49 +06:00
61b02ce1e8
[refs #90 ] fixed error on create
2012-08-08 00:05:43 +06:00
e97c3dc645
[refs #90 ] small controller refactor
2012-08-07 22:34:22 +06:00
2a6b08c269
[refs #90 ] fixed error with wrong treeish
2012-08-07 22:24:47 +06:00
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
61ca25a820
[issue #590 ] Eager loading of BuildList's owner and repository.
2012-08-07 01:41:57 +04:00
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
94178c6ee3
[issue #590 ] Removed unnecessary check from controller.
2012-08-06 15:03:10 +04:00
b963c9342a
[issue #590 ] Repository fetches through project and platform
2012-08-06 14:59:07 +04:00
36de270fad
[issue #590 ] Moved repository check to controller.
2012-08-06 14:21:33 +04:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
6c11597de6
Merge branch 'master' into 90-pull
2012-07-30 16:53:59 +06:00
63801e2676
[issue #590 ] Platform fetches through repository.
2012-07-27 23:37:56 +04:00
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
255bd3a73a
Merge pull request #589 from warpc/551-old_bugs_with_by_object
...
[refs #551 ] by_object changed to by_actor.
2012-07-27 06:45:34 -07:00
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06:00
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
40b0bb4b58
[issue #551 ] by_object changed to by_actor.
2012-07-27 08:12:09 +04:00
35e673d44e
Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263
2012-07-27 00:15:57 +03:00
611b22baa5
Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263
2012-07-17 11:02:56 +03:00
2feb03601b
[refs #90 ] fixed authorize of the merge action
2012-07-16 22:35:44 +06:00
26617b7739
[refs #90 ] add close/reopen button
2012-07-12 20:15:28 +06:00
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06:00
43d2c1b223
[refs #90 ] fix after fail of the pull creation
2012-07-10 22:10:24 +06:00
4663babac6
[refs #90 ] redirect to right place after create
2012-07-10 21:48:11 +06:00
65c139b922
[refs #90 ] dont show empty projects
2012-07-10 19:29:10 +06:00
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
8c5a8c884d
[issue #561 ] Some DB query optimization.
2012-07-10 01:13:55 +04:00
7b3c74e97d
[issue #561 ] Changed BuildList pages
...
* Removed mass_build, cancel and updated_at fields from list
* Added link to commit in list (instead of version)
* Added platform field in list
* Added filter by main platforms
* Added cancel button and mass_build field to BuildList#show
2012-07-10 01:09:27 +04:00
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
1c4c91df5c
[issue #428 ] Fixed attaching projects to advisory.
2012-07-04 21:38:45 +04:00
9e68dae63b
[refs #90 ] fixed autocomplete for new pull
2012-07-04 20:36:52 +06:00
f6cf8373e5
[issue #428 ] Removed fetching of all Advisories.
2012-07-04 17:28:43 +04:00
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
ef945278e8
[refs #90 ] refactoring check methods
2012-06-28 19:47:29 +06:00
ce0ff70561
[refs #90 ] fixed errors
2012-06-27 16:47:08 +06:00
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
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
01b8f3b5c5
[issue #428 ] Fixed typo
2012-06-20 00:32:56 +04:00
dc8a11fa68
[refs #505 ] Merge master into 505-state_machine_migrate
2012-06-19 13:43:38 +04:00
735afaea15
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-06-19 02:57:39 +04:00
Vokhmin Alexey V
Alexander Machehin
Vladimir Sharshov
Pavel Chipiga
George Vinogradov
konstantin.grabar