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
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
cb8345a207
Rename and separate queues. Refs #510
2012-06-18 17:16:53 +03:00
73ec2ec5e9
Fix typo. Refs #510
2012-06-18 14:38:25 +03:00
f19e82b3fc
Add comments for async method calls. Refs #510
2012-06-17 01:51:02 +03:00
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
ac7a3980cd
[refs #505 ] Pending some tests. Return set_version_and_tag. Fix post_build action
2012-06-15 20:05:55 +04:00
5e7342fbd7
[refs #505 ] Comment DJ stub. Fix event name call
2012-06-15 12:47:40 +04:00
5acc13e9a6
[ref #505 ] Refactor set_version_and_tag. Rename success and error events
2012-06-14 17:36:40 +04:00
76b261638f
Merge master into 505-state_machine_migrate
2012-06-14 10:34:55 +04:00
17815ddab2
[refs #505 ] Change start event name and move some logic to set_version_and_tag method
2012-06-13 22:33:23 +04:00
682f33a9bf
[refs #90 ] view merged status
2012-06-13 23:52:11 +06:00
9b3da14f83
[refs #505 ] Add more events and replace hand made status change
2012-06-13 21:27:35 +04:00
f37e0e54a3
[refs #510 ] Replace dj with resque
2012-06-09 16:52:29 +04:00
9af3d22153
[refs #90 ] auto close after manual merge
2012-06-09 15:09:38 +06:00
8fadbf2d41
[refs #90 ] rewrite diff
2012-06-07 23:23:28 +06:00
863213767b
[issue #428 ] Fixed typos. Removed unnecessary parts.
2012-06-05 19:58:11 +04:00
614691a737
[refs #90 ] removed index action
2012-06-05 18:10:51 +06:00
91bf65d65d
[refs #90 ] comments for pull requests (slow version)
2012-06-05 18:08:52 +06:00
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
abe2b8a30d
[issue #428 ] Work with existing advisories.
...
* Added advisories page to platform
* Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
4b8def5bd0
[refs #90 ] add pulls to tracker
2012-06-04 23:00:19 +06:00
60aba754ae
[refs #90 ] pull title/body update
2012-05-31 22:57:52 +06:00
ca72504ca2
[refs #90 ] new/show actions refactoring
2012-05-31 17:23:30 +06:00
f44b9631ad
[refs #90 ] add pull requests authorizations
2012-05-31 00:08:07 +06:00
5c9f914e4a
[refs #511 ] add issue index authorization
2012-05-30 22:03:07 +06:00
26baf999f4
[refs #90 ] diff stats
2012-05-29 23:09:43 +06:00
11c67fb07d
Revert "[refs #90 ] issue status -> state" & changed state -> status
...
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
2012-05-29 16:50:25 +06:00
df610931d7
[refs #90 ] commits tab
2012-05-25 16:48:44 +06:00
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06:00
e211fa2fc3
[refs #90 ] fixed errors, add validations & tests
2012-05-23 22:09:11 +06:00
d643bb3cd0
[refs #90 ] try to prevent create same pull
2012-05-21 19:24:16 +06:00
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
b41a9e3b49
Redo project assign for build_list_packages. Redo and fix double render error during build_list publish. Refs #444 , #481
2012-05-18 00:19:57 +03:00
fcffff4178
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
config/locales/title.en.yml
config/locales/title.ru.yml
config/routes.rb
db/schema.rb
2012-05-17 22:58:29 +06:00
74aee232f9
[refs #90 ] some fixes and merge button
2012-05-17 22:49:29 +06:00
f96990bd25
[refs #90 ] change view
2012-05-16 22:50:30 +06:00
2ae66d6ae4
[refs #466 ] fixed access to project
2012-05-15 17:18:43 +06:00
06191eb12a
Quickfix for status_build. Refs #444
2012-05-15 01:15:48 +03:00
8470674c62
Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444
2012-05-14 22:08:31 +03:00
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
bd2bb2b91f
[refs #90 ] fixed merge
2012-05-12 22:34:27 +06:00
85d4489009
[refs #90 ] dont work pull
2012-05-12 00:23:09 +06:00
f8d32495b8
[issue #428 ] Added title. Changed BuildListsController#update
2012-05-10 19:15:50 +04:00
4040a486fe
[refs #90 ] fix diff
2012-05-10 18:32:54 +06:00
52f5e01575
Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428
2012-05-06 00:43:04 +03:00
8819d0845a
[refs 428] Fix tests and merges missing
2012-05-05 23:26:34 +04:00
381ae0a8b9
[refs #90 ] diff - dont work
2012-05-05 22:57:12 +06:00
1f07332892
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
config/routes.rb
db/schema.rb
2012-05-04 21:29:04 +04:00
813afe53cf
[refs #90 ] minor interface changes
2012-05-04 23:13:41 +06:00
c5731ff8dd
[refs #90 ] fixed merging errors
2012-05-04 16:56:11 +06:00
178dbdc5f0
[refs #90 ] move files
2012-05-03 23:55:08 +06:00
36b4ce2d99
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
2012-05-03 23:19:43 +06:00
2539ef4795
Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263
2012-05-02 12:18:07 +03:00
Vokhmin Alexey V
Alexander Machehin
Vladimir Sharshov
Pavel Chipiga
George Vinogradov
konstantin.grabar