Pavel Chipiga
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
Alexander Machehin
f2565c4877
[refs #90 ] remove Baden-Baden
2012-08-15 19:50:26 +06:00
Vladimir Sharshov
cada20ed63
Merge branch 'master' into 590-build_list_page_change
2012-08-14 15:46:16 +04:00
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
efa08933fd
[issue #590 ] Added average build time to :build_started BuildLists
2012-08-12 02:08:28 +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
5759a53fae
Temporarily transfer path for the git repository via NFS
2012-08-10 18:50:30 +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
Vladimir Sharshov
f4b3c53362
Inform the kernel about project git address
2012-08-09 17:56:45 +04:00
konstantin.grabar
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
Alexander Machehin
4c02d4be19
[refs #90 ] fixed error
2012-08-08 16:33:48 +06: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
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
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
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
ea16c47105
[refs #590 ] Fix mass build
2012-08-07 00:04:52 +04:00
Alexander Machehin
be6179b2ad
[refs #90 ] clean comment
2012-08-07 00:24:31 +06:00
Alexander Machehin
02214dda09
[refs #90 ] fixed merge with master
2012-08-07 00:17:04 +06:00
Alexander Machehin
c268930a45
[refs #90 ] small refactoring
2012-08-07 00:13:07 +06:00
Alexander Machehin
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
Alexander Machehin
09a5180c22
[refs #90 ] remove Baden-Baden
2012-08-06 23:53:55 +06:00
George Vinogradov
710fef1f0b
Merge pull request #602 from warpc/601-add_status_check_for_product_bl_remove
...
[refs #601 ] Add status check for destroy action in product build list
2012-08-06 08:40:43 -07:00
Vladimir Sharshov
08c58a84df
[refs #604 ] Remove old build list after 3 month
2012-08-06 19:35:11 +04:00
konstantin.grabar
43d8e2020c
[refs #374 ] Remove states check logic from ability.rb. Small api reject answer fix
2012-08-06 16:21:19 +04:00
Vladimir Sharshov
c7a3addfb8
[refs #601 ] Add statuscheck for destroy action in product build list
2012-08-06 16:06:42 +04:00
Vladimir Sharshov
0e3e5c0ce1
Merge pull request #600 from warpc/590-build_list_page_change
...
[refs #590 ] build list page change:
* Fix migration;
* Repository rights checking moved to controller;
* Repository fetches through project and platform.
2012-08-06 04:18:26 -07:00
konstantin.grabar
36da0cf808
[refs #374 ] Continue tests fix
2012-08-06 14:43:04 +04:00
George Vinogradov
36de270fad
[issue #590 ] Moved repository check to controller.
2012-08-06 14:21:33 +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
a1b7bcac32
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +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
konstantin.grabar
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
konstantin.grabar
6c4a574f49
[refs #441 ] self.key_id and stub result fix
2012-07-31 17:05:25 +04:00
konstantin.grabar
931d4a7db0
[refs #441 ] Key Pairs fixes and refactoring
2012-07-31 16:50:53 +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
73a369ba49
[refs #441 ] Refactring: part 2. Fix integration with kernel, change view for keys list
2012-07-31 01:24:31 +04:00
George Vinogradov
ef25bb502a
[issue #565 ] refactoring, proposed by @alexander-machehin
2012-07-31 00:42:32 +04:00
George Vinogradov
d7e9cefd0b
[issue #590 ] Added validation on repository.
2012-07-30 23:26:51 +04:00
Vladimir Sharshov
89d67f9ea6
[refs #441 ] Refactring, fix errors
2012-07-30 23:08:14 +04:00
konstantin.grabar
724b36a4b4
Merge master into 570-mass_builds_status_counters_bug
2012-07-30 18:53:18 +04:00
konstantin.grabar
dd13b38da3
[refs #570 ] Add status variable
2012-07-30 18:49:40 +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
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06: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
548fb99ebe
[refs #570 ] Try to do counters change into transaction with locking
2012-07-27 16:28:08 +04:00
Pavel Chipiga
fb60dac748
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-07-27 00:19:36 +03:00
Pavel Chipiga
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
konstantin.grabar
f9b217379d
[refs #570 ] Add mass build counters logs
2012-07-26 15:45:23 +04:00
konstantin.grabar
91dddd5dac
Merge branch 'master' into 570-mass_builds_status_counters_bug
2012-07-26 15:06:09 +04:00
Vladimir Sharshov
606609dea6
Merge pull request #580 from warpc/576-flash_notifies
...
[refs #576 ] Add flash notifies
2012-07-25 12:18:44 -07:00
Pavel Chipiga
03509e714c
Merge branch 'master' into 263-refactoring
2012-07-25 21:42:48 +03:00
konstantin.grabar
c0036a1bb5
[refs #576 ] Fix should_show? method and template offsets
2012-07-25 16:41:12 +04:00
Alexander Machehin
a0a4c8b100
[refs #581 ] dont destroy child projects
2012-07-24 22:02:02 +06:00
konstantin.grabar
3d19a4f23e
[refs #576 ] Optimize tests, views and model
2012-07-24 13:19:22 +04:00
konstantin.grabar
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
George Vinogradov
ee15ca26ca
[issue #565 ] Refactoring. Fixed html mail template.
2012-07-20 23:59:32 +04:00
George Vinogradov
6d046764ef
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 20:15:55 +04:00
George Vinogradov
d6c65a1626
[issue #565 ] Added feedback form.
...
* Added web pages to send request
* Added mailer to send feedback message.
2012-07-20 20:06:31 +04:00
Alexander Machehin
d130409640
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
konstantin.grabar
7061696100
[refs #570 ] Replace :all to :everything for builds filter
2012-07-18 17:49:21 +04:00
konstantin.grabar
6430678c00
[refs #570 ] Add :all option for build lists visibility
2012-07-18 16:00:40 +04:00
konstantin.grabar
778b76e5ff
[refs #570 ] Fix mass builds counters update. Fix mass build and failed_build_list links
2012-07-18 14:31:49 +04:00
konstantin.grabar
3a183e0dc3
[refs #441 ] Remove unused files. Add mass assigment specs
2012-07-17 13:31:32 +04:00
Pavel Chipiga
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
konstantin.grabar
70b2d62e52
[refs #441 ] Some small fixes of locales and code
2012-07-16 13:58:33 +04:00
konstantin.grabar
3cf3546c2e
[refs #441 ] Add secret to filter. Add repository key exist check
2012-07-13 18:16:56 +04:00
konstantin.grabar
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04:00
Alexander Machehin
26617b7739
[refs #90 ] add close/reopen button
2012-07-12 20:15:28 +06:00
Pasha
d9755f295c
Merge pull request #567 from warpc/523-block_import
...
[refs #523 ] Fix periodically error ActiveRecord::RecordNotFound in Resque service
2012-07-11 13:48:10 -07:00
Vladimir Sharshov
5b93ef9134
[refs #523 ] limit callback only for create action(update)
2012-07-12 00:40:55 +04:00
Vladimir Sharshov
84f4d7d423
[refs #523 ] limit callback only for create action
2012-07-12 00:24:31 +04:00
Vladimir Sharshov
b22a2ce3ba
[refs #523 ] Fix periodically error ActiveRecord::RecordNotFound in Resque service
2012-07-12 00:01:41 +04:00
Alexander Machehin
65f94e763e
[refs #90 ] add the commit merge message
2012-07-10 23:13:23 +06:00
Alexander Machehin
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06: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
Vladimir Sharshov
c45e599eb0
Merge pull request #560 from warpc/442-mass_build
...
[refs #442 ] Add tests for mass builds and attr_accessible. Fix ability.
2012-07-10 02:49:23 -07:00
konstantin.grabar
1de9277e4a
[refs #442 ] Add main? method for platforms
2012-07-10 11:06:08 +04:00
George Vinogradov
f997e50905
[issue #561 ] Some cosmethic changes.
...
* Reordered columns in BuildLists table
* Reordered rows in BuildLists filter
* Removed created_at filter (Commented. See TODOs)
2012-07-10 01:49:19 +04:00
George Vinogradov
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
Alexander Machehin
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
konstantin.grabar
620d78fd1b
[refs #442 ] MassBuilds create refactor and specs fix
2012-07-09 20:48:31 +04:00
konstantin.grabar
adc917ca3b
[refs #442 ] MassBuild data initialize refactor
2012-07-09 20:13:02 +04:00
Vladimir Sharshov
d7ee0fe938
Merge pull request #559 from warpc/428-advisory
...
[refs #428 ] Advisory: new look
2012-07-09 08:44:13 -07:00
Alexander Machehin
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
konstantin.grabar
1f2a3b82d3
[refs #442 ] Add tests for mass builds and attr_accessible. Fix ability
2012-07-06 20:49:21 +04:00
George Vinogradov
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
George Vinogradov
a2d35d2538
[issue #527 ] Use User#fullname instead of string.
2012-07-04 19:53:18 +04: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
4eac2a232f
[refs #442 ] Ability rights refactor. status_by_human refactor
2012-07-04 15:22:26 +04:00
Alexander Machehin
d6df9953f2
[refs #90 ] fixed pull path
2012-07-04 16:35:35 +06: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
George Vinogradov
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +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
konstantin.grabar
0827cf5100
[refs #442 ] Add other mass builds action to mass_builds controller. Rename cancel_mass_builds action
2012-07-03 18:34:07 +04:00
Alexander Machehin
ea8775f1f7
[refs #547 ] remove mistake condition
2012-07-03 16:42:58 +06:00
konstantin.grabar
c7232c53e9
[refs #442 ] Fix some locales. Fix batch_size
2012-07-03 12:44:51 +04:00
konstantin.grabar
8f9a6ee2d2
[refs #442 ] Change cancel btn. Move some actions to mass_builds controller. Add more ability rights
2012-07-02 18:50:47 +04:00
konstantin.grabar
004f603e02
[refs #442 ] Add new actions rights. Cancel build list btn rights fix
2012-06-29 23:10:18 +04:00
konstantin.grabar
8cfe262045
[refs #442 ] Fix status filter
2012-06-29 22:31:40 +04:00
konstantin.grabar
160bdca0c8
[refs #442 ] Add cancel_all to background. Add ownership and fix status links
2012-06-29 22:08:33 +04:00
konstantin.grabar
9c07879dc2
[refs #442 ] Add forgotten cancel
2012-06-29 20:01:32 +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
Alexander Machehin
59c0300542
[refs #442 ] small refactoring
2012-06-29 17:42:05 +06:00
Alexander Machehin
adb3b1ccab
[refs #442 ] fixed bug with priority
2012-06-29 17:38:06 +06:00
Alexander Machehin
67c55bcb56
[refs #442 ] fixed infinite loop
2012-06-29 17:01:40 +06: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
Alexander Machehin
ef945278e8
[refs #90 ] refactoring check methods
2012-06-28 19:47:29 +06:00
Vladimir Sharshov
174c4dab0b
Merge pull request #540 from warpc/442-mass_build
...
[refs #442 ] Support mass build statistic
2012-06-28 05:02:44 -07:00
Alexander Machehin
ae4c8a6a5e
[refs #90 ] fixed lost data after merge
2012-06-28 16:44:55 +06:00
Vladimir Sharshov
126f58ac85
Fix publication for old version of build client
2012-06-27 18:57:30 +04:00
Alexander Machehin
ce0ff70561
[refs #90 ] fixed errors
2012-06-27 16:47:08 +06: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
Vladimir Sharshov
96d284d5ee
Merge pull request #533 from warpc/531-fix_users_role
...
[refs #531 ] Changed the rules for granting user rights in the project
2012-06-26 05:44:16 -07:00
Alexander Machehin
4f1e51a8af
[refs #90 ] fix reset commit after automerge
2012-06-26 15:43:32 +06:00
Alexander Machehin
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
Alexander Machehin
9625e1bb4f
[refs #531 ] small refactoring
2012-06-25 20:31:41 +06:00
konstantin.grabar
651dd57044
Merge branch 'master' into 442-mass_build
2012-06-25 18:29:16 +04:00
konstantin.grabar
baec8a1016
[refs #525 ] Fix clear action rights
2012-06-25 18:26:01 +04:00
Vladimir Sharshov
b01d3cecba
Merge pull request #539 from warpc/525-repository_erase
...
[refs #525 ] Rename erase to clear. Fix flash. Replace repository to platform in locales
2012-06-22 12:19:51 -07: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
Alexander Machehin
9a2dcda3d1
[refs #537 ] fixed build list publish transaction
2012-06-22 16:38:09 +06:00
Alexander Machehin
d5a6b47be3
[refs #531 ] user best role tests
2012-06-21 20:19:44 +06:00
Alexander Machehin
d2f4135065
[refs #531 ] refactoring
2012-06-21 15:49:39 +06:00
konstantin.grabar
5e3241a1f5
[refs #525 ] Rename erase to clear. Fix flash. Replace repository to platform in locales
2012-06-21 11:15:26 +04:00
Alexander Machehin
93ec9a135d
[refs #531 ] some refactoring and model tests
2012-06-21 00:10:27 +06:00
konstantin.grabar
3ebd36f6fe
[refs #525 ] Erase corrections and refactor
2012-06-20 22:02:42 +04:00
Alexander Machehin
4d91ea1d6e
[refs #531 ] fixed user roles
2012-06-20 23:59:47 +06:00
George Vinogradov
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
Vladimir Sharshov
ecf4666a31
Merge pull request #535 from warpc/525-repository_erase
...
[refs #525 ] Add erase repository functional
2012-06-20 09:48:19 -07:00
konstantin.grabar
ad7d3795e6
Replace after_create on after_commit for build_list
2012-06-20 19:08:21 +04:00
George Vinogradov
3d38adcb94
[issue #428 ] Added Atom feed to advisories.
2012-06-20 18:44:32 +04:00