613db04375
#90 : added limit for commits into the pull request
2012-09-26 21:00:58 +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
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +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
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
51c9375613
[refs #616 ] change preview translation
2012-09-24 23:40:41 +06:00
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
7812adfdbc
[refs #374 ] Add custom http basic auth for api
2012-09-21 23:15:56 +04:00
ceeae09332
#648 : small revert, updated filter name
2012-09-21 22:08:19 +04:00
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
1dcce7bf92
[refs #616 ] small fixes
2012-09-20 20:58:14 +06:00
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
32e05de186
[refs #616 ] cheat sheet small i18n
2012-09-20 00:53:40 +06:00
a85a95d18a
[refs #616 ] markdown cheat sheet
2012-09-19 23:35:43 +06:00
f7d28dd23c
[refs #374 ] Patch Rack::Throttle http_error method. Finish main page
...
text
2012-09-19 19:02:54 +04:00
4fc9ba7aeb
[refs #616 ] add lost i18n
2012-09-19 15:41:08 +06:00
967c5daaa8
#575 : added 'arch' to subject and body of email
2012-09-18 16:03:10 +04: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
ef923d06c7
#575 : added build_list_notification
2012-09-16 21:29:45 +04:00
01576702a0
#575 : added migration, updated Settings page
2012-09-14 20:12:48 +04:00
c690a8446a
Merge pull request #644 from warpc/633-fix-ui-on-build-list-page
...
[refs #633 ] Fixed blocking auto publication in personal repository. Refactoring creating build list page.
2012-09-13 16:39:19 -07:00
fc4eb189b5
Add new staging server;
...
Remove special application config;
Change localization (builded to built);
Add quotes to git command.
2012-09-14 00:46:56 +04:00
4138399ad3
#633 : updated message
2012-09-13 20:23:49 +04:00
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +04:00
5a699ad379
Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
...
[refs #638 ] Repository supervisor
2012-09-12 13:52:42 -07:00
1a75a5a394
#638 : updated Relation model, repositories and platforms controllers according to comments
2012-09-12 23:32:51 +04:00
e3bcd2382e
[refs #641 ] Show only public projects in group profile
2012-09-12 18:49:40 +04:00
b468b09529
#638 : some refactoring for adding new user
2012-09-12 17:07:34 +04:00
3858bfa6b7
#638 : added members to repository model, updated views
2012-09-11 19:30:14 +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
0a61ad613a
#631 : updated messages
2012-09-06 19:50:12 +04:00
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
f0f11cb9dc
#631 : added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
2012-09-06 17:43:50 +04:00
b9a622acec
[refs #374 ] Add unixtime search and output. Fix rate limit configuration and 404 status
2012-09-05 17:47:25 +04:00
58d9a972ef
[refs #374 ] Add rate limit
2012-09-04 22:48:14 +04:00
ff8f9da14f
[refs #374 ] Refactor api build list create method
2012-09-04 16:44:28 +04:00
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
1aa5f73192
[issue #620 ] Fixed typo in localization.
2012-08-31 22:48:06 +04:00
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
0607eedb15
[refs #626 ] Set invites redirect add register link to top menu
2012-08-30 14:30:07 +04:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
03986b7c21
[refs #374 ] Remove index actions from projects and reps. Add projects#get_id. Update tests. Fix build list show template
2012-08-28 20:57:12 +04:00
f688985814
[issue #620 ] Changed maintainer assignment.
...
* Added `project:maintainer:set_to_owner` task to set projects maintainer
to its owner
* Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
de5b7cc6fc
[refs #616 ] add x-diff mime type
2012-08-27 22:52:27 +06:00
d24a149d9a
[issue #620 ] Added search of maintainer by package
2012-08-24 20:06:59 +04: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
96dc76575c
Add new deploy server
2012-08-24 14:24:43 +04:00
8629d67030
Add javascript callback for "assignee"
...
To make intrgration with external trackers easier, add JS API for
assignee retrieval. It returns a script that calls a function that
should act somehow depending on how it was defined.
2012-08-21 23:58:15 +04:00
e75a676895
Add "assignee" JSON callback
...
The callback reports the assignee of a package in a platform given.
Used for integration with external bug trackers.
2012-08-21 23:58:15 +04:00
388a0028da
Add Maintainer Database and list view for it
...
This commit adds list of maintainers of a platform to page
/platforms/:id/maintainers. This list is intended to serve as a
counterpart for http://maint.mandriva.com/listpkgs.php .
The commit adds a "view" on a build_list_packages table: it selects only
the latest builds for each package, and summarizes the information about
such packages in "maintainers" table.
This is a testing mode only, so the link to maintainers table is not
shown.
2012-08-21 23:57:39 +04:00
5dc50056df
[refs #374 ] Add repositories, platforms and projects read API
2012-08-21 14:19:38 +04:00
e637191a61
[refs #616 ] fixed caption of the button
2012-08-20 23:27:43 +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
cada20ed63
Merge branch 'master' into 590-build_list_page_change
2012-08-14 15:46:16 +04:00
38e1d0c8ee
[issue #590 ] Added live log to BuildList
2012-08-14 01:41:15 +04: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
e535ff2fed
Merge pull request #611 from warpc/590-build_list_page_change
...
[refs #590 ] Dirty hack to fix BuildList#index
2012-08-10 09:26:11 -07:00
9030056c1b
[issue #590 ] Changed _build_list partial.
2012-08-10 20:14:45 +04:00
45169faf2f
Merge pull request #609 from warpc/590-build_list_page_change
...
[refs #590 ] add time notification and periodic page update
2012-08-09 14:49:12 -07:00
cc1a076516
[issue #590 ] Fixed translations.
2012-08-10 00:24:36 +04:00
e5e8cc7e7f
[issue #590 ] Changed time representation.
...
* Removed buggy jquery.countdown plugin
* Page reloads every minute
2012-08-09 20:39:01 +04:00
9bf2f728a7
[refs #90 ] change new action from post to get
2012-08-08 23:21:49 +06:00
3641b187bc
[refs #90 ] fixed locales
2012-08-08 21:57:33 +06:00
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
6b82fb6ac3
Increase unicorn workers
2012-08-06 22:28:23 +03:00
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
8934d310a0
Merge pull request #603 from warpc/590-build_list_page_change
...
[refs #590 ] On monitoring and build list pages change platform to repository.
2012-08-06 05:36:32 -07:00
dadbaefea4
[issue #590 ] On monitoring page platform changed to repository.
2012-08-06 16:31:44 +04:00
c7a3addfb8
[refs #601 ] Add statuscheck for destroy action in product build list
2012-08-06 16:06:42 +04:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
c7d13fd607
[issue #565 ] Added question description.
2012-08-04 02:28:43 +04:00
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
23b4136d05
Merge pull request #598 from warpc/help_info
...
[refs #597 ] Add help page for new git repo. Remove link to README in project pages, small refactoring.
2012-08-03 09:24:26 -07:00
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
8bc229f933
[refs #597 ] Add help page for new git repo. Remove link to README in project pages, small refactoring.
2012-08-03 18:31:04 +04:00
f3db00832a
[refs #374 ] Api v1 base functional and specs
2012-08-03 14:05:05 +04:00
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
7f5f147c36
[issue #590 ] Fixed translation
2012-08-01 09:15:56 +04:00
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
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
931d4a7db0
[refs #441 ] Key Pairs fixes and refactoring
2012-07-31 16:50:53 +04:00
43309d86e6
Merge branch 'master' into 441-key_pairs, fix schema, add migration
...
Conflicts:
db/schema.rb
2012-07-31 02:02:15 +04:00
73a369ba49
[refs #441 ] Refactring: part 2. Fix integration with kernel, change view for keys list
2012-07-31 01:24:31 +04:00
d7e9cefd0b
[issue #590 ] Added validation on repository.
2012-07-30 23:26:51 +04:00
89d67f9ea6
[refs #441 ] Refactring, fix errors
2012-07-30 23:08:14 +04:00
724b36a4b4
Merge master into 570-mass_builds_status_counters_bug
2012-07-30 18:53:18 +04:00
f674735c8c
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-07-30 13:31:28 +04:00
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04: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
5aecdc203b
Merge pull request #571 from warpc/263-refactoring
...
[refs #263 ] Big git refactoring
2012-07-27 04:51:34 -07:00
fb60dac748
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-07-27 00:19:36 +03:00
354752f6cb
Merge remote-tracking branch 'origin/570-mass_builds_status_counters_bug' into 570-mass_builds_status_counters_bug
2012-07-26 15:47:33 +04:00
48f8c3ad08
[refs #374 ] Add json responses for build lists api
2012-07-26 13:22:51 +04:00
f1839f0ad0
[issue #578 ] Added submit blocking to user creation
2012-07-26 02:12:06 +04:00
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
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
a69ad0f88a
[issue #565 ] Changed translation.
2012-07-20 20:58:23 +04:00
c37866d5e6
[issue #565 ] Added page title.
2012-07-20 20:36:09 +04:00
f61e9db5c6
[issue #565 ] Added Support link to bottom menu
2012-07-20 20:23:51 +04:00
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
71fc19edc8
[refs #570 ] Change localization for fields
2012-07-18 23:04:26 +04:00
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06: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
b903969aa6
[refs #90 ] changed displaying status message
2012-07-16 23:02:04 +06:00
34e97510cd
[refs #90 ] modify pull headers
2012-07-16 22:27:41 +06:00
70b2d62e52
[refs #441 ] Some small fixes of locales and code
2012-07-16 13:58:33 +04:00
3cf3546c2e
[refs #441 ] Add secret to filter. Add repository key exist check
2012-07-13 18:16:56 +04:00
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04: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
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
f83a1ae6c2
[issue #561 ] Changed translations.
2012-07-10 02:55:34 +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
fa5deed42f
[issue #428 ] Added BuildLists list to Advisory#show
2012-07-04 22:32:10 +04:00
1c4c91df5c
[issue #428 ] Fixed attaching projects to advisory.
2012-07-04 21:38:45 +04:00
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +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
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
6afe8c0375
[refs #442 ] Merge master into 442-mass_build
2012-07-03 18:41:02 +04:00
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
b46a7aba39
Fix branch with dots. Refs #263
2012-07-03 15:05:27 +03:00
c7232c53e9
[refs #442 ] Fix some locales. Fix batch_size
2012-07-03 12:44:51 +04:00
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
6507ad280f
[refs #442 ] Merge master into 442-mass_build
2012-06-29 16:40:54 +04:00
7561abca08
[refs #462 ] refactoring: remove notified_at
2012-06-28 21:40:32 +04:00
46161253ab
[refs #462 ] Product status does not change
2012-06-28 19:54:58 +04:00
ce163f89a9
[refs #442 ] Add rep_name field. Add cancel builds ability
2012-06-28 19:23:33 +04:00
174c4dab0b
Merge pull request #540 from warpc/442-mass_build
...
[refs #442 ] Support mass build statistic
2012-06-28 05:02:44 -07:00
10aed58bdd
[refs #442 ] Small refactor. Remove bootstrap collapse
2012-06-28 15:31:25 +04:00
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +04: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
1ac1e42894
small fix to Russian translation
2012-06-27 15:59:58 +06:00
fc00f713b5
[refs #442 ] Add counters update checking. Add build_error counter
2012-06-27 13:48:54 +04:00
9b41fd50af
[refs #90 ] fixed translation of titles & headers
2012-06-26 15:40:37 +06:00
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
bdb97b8891
[refs #442 ] Add statistics data to mass builds. Small refactor for report
2012-06-25 19:20:35 +04:00
5e3241a1f5
[refs #525 ] Rename erase to clear. Fix flash. Replace repository to platform in locales
2012-06-21 11:15:26 +04:00
dfb1da97b4
[refs #525 ] Fix locales
2012-06-20 22:33:49 +04:00
3ebd36f6fe
[refs #525 ] Erase corrections and refactor
2012-06-20 22:02:42 +04:00
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
4b9a04e3f7
[refs #525 ] Set erase route to post
2012-06-20 20:40:50 +04:00
3d38adcb94
[issue #428 ] Added Atom feed to advisories.
2012-06-20 18:44:32 +04:00
270dbf2e9b
[refs #525 ] Add erase repository functional
2012-06-20 17:21:32 +04:00
cb8345a207
Rename and separate queues. Refs #510
2012-06-18 17:16:53 +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
682f33a9bf
[refs #90 ] view merged status
2012-06-13 23:52:11 +06:00
d45e95b0e9
Merge branch 'master' into 207-platform_clone
...
Conflicts:
app/views/layouts/menu/_top.html.haml
2012-06-09 19:08:55 +03:00
ec21c042dd
Fix and refactor active menu. Refs #207
2012-06-09 19:04:06 +03:00
cdf2316a76
[refs #510 ] Add queues to capistrano deploy. Add 4 workers to config
2012-06-09 18:53:00 +04:00
f37e0e54a3
[refs #510 ] Replace dj with resque
2012-06-09 16:52:29 +04:00
26299c234b
[refs #510 ] Add resque to the admin submenu
2012-06-08 19:02:45 +04:00
da33173700
[refs #510 ] Add multiple workers. Change kill and start logic
2012-06-08 16:40:50 +04:00
8fadbf2d41
[refs #90 ] rewrite diff
2012-06-07 23:23:28 +06:00
597ac65dee
[refs #510 ] Resque deploy refactor. Turn off bluepill
2012-06-07 19:13:58 +04:00
da9d7574d1
[refs #510 ] Return daemonize option back to production.pill
2012-06-07 14:53:21 +04:00
ac2e267a8a
[refs #510 ] Remove daemonize option from production.pill
2012-06-07 14:39:32 +04:00
7db11f40c8
[refs #510 ] Remove children kill from production.pill
2012-06-07 14:25:38 +04:00
a266e57219
[refs #510 ] Add bluepill stop, start and restart to depoy and stop recipe
2012-06-07 13:27:19 +04:00
ae6a3e6506
[refs #510 ] Change resque queue name
2012-06-06 22:57:45 +04:00
8dbdcee5e6
[refs #510 ] Add resque start to bluepill
2012-06-06 18:54:03 +04: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
8478ca405f
[refs #90 ] disable index action for pull request
2012-06-04 23:13:45 +06:00
c185a13543
[refs #90 ] change russian translation
2012-06-04 23:00:56 +06:00
d29065a12a
[refs #510 ] Remove fork and import queues from bluepill instruction
2012-06-01 17:58:14 +04:00
4fb74cdd50
[refs #510 ] Remove double admin namespace
2012-06-01 17:30:11 +04:00
7d58937149
[refs #510 ] Add resque recipes for capistrano
2012-06-01 16:54:58 +04:00
526bdbe60f
[refs #510 ] Resque sinatra app secure
2012-05-31 17:36:41 +04: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
f8edecc915
Merge branch 'master' of github.com:warpc/rosa-build
2012-05-28 23:28:09 +04:00
5e9f348074
[ref #442 ] Add id column
2012-05-28 23:18:50 +04:00
2479c1c98b
Merge branch 'master' of github.com:warpc/rosa-build
2012-05-28 16:06:02 +04:00
b6e0e81b90
[refs #263 ] fixed do-not-reply emails
2012-05-28 16:22:36 +06:00
3fbd2ae79e
Merge branch 'master' of github.com:warpc/rosa-build
2012-05-28 13:05:31 +04:00
3ed195bb86
Merge pull request #502 from warpc/442-mass_build
...
[refs #442 ] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
0f1c92cac2
Fix translation for build status
2012-05-26 00:22:23 +04:00
df82cf69ca
[refs #442 ] Refactor mass_build
2012-05-25 21:31:57 +04:00
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04: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
0d3e06b5d9
Merge pull request #499 from warpc/478-project_build_failed
...
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 03:39:55 -07:00
3d2bcdd019
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 14:21:57 +04:00
45ff187875
[refs #442 ] Remove button. Add tab. Fix locales. Fix schema
2012-05-23 20:44:04 +04:00
e211fa2fc3
[refs #90 ] fixed errors, add validations & tests
2012-05-23 22:09:11 +06:00
a83927c812
[refs #442 ] Fix mass_build_id locales
2012-05-23 18:19:04 +04:00
c74de8b84d
[refs #442 ] Add new page for mass rebuild, new fields and new functional
2012-05-23 18:08:11 +04:00
0c89ca6575
[refs #90 ] broken tests
2012-05-23 00:23:00 +06:00
7c45263799
[refs #442 ] Add mass build select to monitoring. Remove build lists from build_all action
2012-05-22 17:40:27 +04:00
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04: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
1bcab2f7db
[refs #443 ] remove old file, fixed ru translation
2012-05-21 16:46:08 +06:00
be2ab9154c
[refs #442 ] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes
2012-05-21 14:18:29 +04:00
5133fe6bc3
Merge pull request #487 from warpc/443-tour
...
[refs #443 ] invite localization
2012-05-18 11:10:15 -07:00
aad7a3a547
[refs #443 ] invite localization
2012-05-18 22:54:57 +06:00
cd3564bb81
[refs #442 ] Add mass build model and new build_all fixes
2012-05-18 19:12:51 +04:00
130a45f584
Merge pull request #485 from warpc/438-remove_rsync_mount_from_app
...
[refs #438 ] Fix symlink stubbing
2012-05-18 02:19:41 -07:00
9920802006
[refs #438 ] Fix symlink stubbing
2012-05-18 13:03:42 +04:00
a804f3ef2c
[refs #461 ] Correct translation for is_package option
2012-05-18 00:40:30 +04: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
3e57359c96
[refs #442 ] Add mass build page functional
2012-05-17 19:20:03 +04:00
ec9c19352e
[refs #461 ] Merge master into to 461-rename_is_rpm_to_is_package. Again
2012-05-17 12:00:21 +04:00
f96990bd25
[refs #90 ] change view
2012-05-16 22:50:30 +06:00
2892689807
Merge pull request #469 from warpc/443-tour
...
[refs #466 ] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
9d871af7ef
Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:40:10 +04:00
1385133ed5
[refs #461 ] Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:37:35 +04:00
79a9b3d107
[refs #461 ] Fix is_package locale. Fix schema.rb and rename migration
2012-05-16 14:33:14 +04:00
5ad43c684e
Merge master into 429-uname_format_error_explain
2012-05-16 14:01:41 +04:00
05746ea449
[refs #466 ] add i18n
2012-05-15 21:35:48 +06:00
e807e5f3ec
[refs #429 ] Add format explain error message for uname
2012-05-15 15:11:18 +04:00
56ad094b00
Merge pull request #463 from warpc/444-bl_package
...
[refs #444 ] Apply basic build list packages store functionality;
* Display build list package content;
* Write specs.
2012-05-14 13:12:37 -07: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
aa38017daa
[refs #340 ] restore page titles
2012-05-14 23:24:09 +06:00
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
f335863881
Fix dot in project name routes. Refactor and write basic route specs. Refs #454
2012-05-14 16:24:01 +03:00
64d5600e6f
Merge pull request #447 from warpc/443-tour
...
[refs #443 ] Tour about the system
2012-05-12 10:11:16 -07:00
398cec4806
[refs #443 ] add js to precompile
2012-05-12 21:23:33 +06:00
cada9f6e51
[issue #443 ] Changed tour routes. Fixed submenu position.
2012-05-12 01:05:48 +04:00
a048509426
[issue #443 ] Numeric ids changed to words.
2012-05-12 00:45:37 +04:00
5f5eb00c4f
[refs #443 ] abf tour
2012-05-12 00:15:20 +06:00
1a9f529152
[issue #430 ] Added rake task to remove outdated BuildLists.
2012-05-11 21:44:19 +04:00
5320fc2d3e
[issue #428 ] AdvisoriesController moved from its scope
2012-05-10 21:17:59 +04:00
3e0ebdc929
[refs #90 ] change route
2012-05-10 22:57:59 +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
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
6fe0e5b530
[issue #428 ] Added AdvisoriesController & show view.
2012-05-05 02:53:45 +04: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
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
c5731ff8dd
[refs #90 ] fixed merging errors
2012-05-04 16:56:11 +06:00
5157f31081
Refactor routes to separate owner profile and project. Redo short groups profile URL. Improve specs. Refs #236
2012-05-04 00:52:56 +03: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
b1b5363972
Fix deploy. Redo main group route. Refs #263
2012-05-03 19:48:22 +03:00
abb60a503a
Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263
2012-05-03 17:08:02 +03:00
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +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
b957600eda
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/models/project.rb
app/views/projects/_repo_block.html.haml
db/schema.rb
spec/controllers/issues_controller_spec.rb
spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
4ad39b05c0
[refs #90 ] model PullRequest, tests
2012-04-28 23:30:54 +06:00
de093d7065
[issue #425 ] Changed object to actor in Relation and to eventable in
...
EventLog
2012-04-26 05:38:33 +04:00
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
e984402068
[refs #417 ] Rename pingwinsoft configs to school
2012-04-23 18:37:12 +04:00
95c795e3ab
[refs #417 ] Remove http and slash symbols from action mailer hosts
2012-04-23 17:37:15 +04:00
0ca6c76ce2
[refs #417 ] Make changes for devise action mailer host set
2012-04-23 16:53:30 +04:00
24922cc43c
Merge pull request #388 from warpc/347-javascript_refactoring
...
[issue #347 ] Union users and groups into one table in collaborators page. Use backbone(JS framework) for it. Improve UI for collaborators page (AJAX).
2012-04-20 08:15:12 -07:00
701da7e1f9
Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263
2012-04-19 22:45:50 +03:00
5efabc9d4e
Fix atom feed urls. Refs #396
2012-04-19 20:35:35 +03:00
510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
5b5aec490a
Merge pull request #409 from warpc/396-rss_atom_feed
...
[refs #396 ] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
def76d134d
[refs #396 ] Fix some atom locales
2012-04-19 15:05:17 +04:00
2fc4e2db61
[refs #396 ] Fix token migration. Fix atom link tag title
2012-04-19 14:50:43 +04:00
cd153375dd
[refs #396 ] Devise token auth update for atom feed. Some atom feed fixes.
2012-04-18 19:15:04 +04:00
3d1cb4bfee
Merge master into 396-rss_atom_feed
2012-04-18 16:53:53 +04:00
721fa1b0c0
[issue #408 ] Fixed translations
2012-04-18 14:59:41 +04:00
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
8d723ee0be
[refs #396 ] Fix title truncate and strip. Add feed main title.
2012-04-17 19:38:02 +04:00
2dafd49763
[refs #396 ] Add atom feed
2012-04-17 19:01:35 +04:00
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
2c9d4583e8
[refs #404 ] Remove downloads from menu
2012-04-17 13:17:52 +04:00
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
ba9184cc49
Merge pull request #398 from warpc/223-build_list_notify_and_duration_updates
...
223 build list notify and duration updates
2012-04-13 11:43:57 -07:00
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
8ffc6be347
Merge branch '223-change_build_lists_new_js_handlers' into 223-build_list_notify_and_duration_updates
...
Conflicts:
app/models/build_list.rb
config/locales/models/build_list.en.yml
config/locales/models/build_list.ru.yml
2012-04-13 17:21:30 +04:00
d8edf8e673
Merge pull request #397 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add build list duration
2012-04-13 05:25:20 -07:00
36447051ec
[Refs #223 ] Small refactoring for pull request
2012-04-13 13:48:57 +04:00
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
65f1cfc822
[refs #223 ] Add current duration and project average build time
2012-04-12 18:55:32 +04:00
26a468f6e3
[refs #223 ] Replace notified_at by updated_at
2012-04-12 16:12:06 +04:00
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
68b3446747
Fix password restore routes. Change input field type. Refs #263
2012-04-10 20:12:30 +03:00
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
c619aa44b7
[refs #223 ] Fix build list status
2012-04-10 17:11:36 +04:00
3cff036508
[refs #223 ] Add new build btn to project page
2012-04-10 17:07:09 +04:00
dfddee82ab
[refs #353 ] fixed english translation
2012-04-10 01:43:45 +06:00
cd938532d0
[refs #353 ] fixed russian translate
2012-04-10 01:10:44 +06:00
5658707fe1
[refs #353 ] divide long string
2012-04-10 00:13:42 +06:00
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
e491b8bfb4
Merge pull request #382 from warpc/358-git_help_info_div
...
[refs #358 ] Add git clone repo help hint
2012-04-05 13:23:13 -07:00
76f7507b22
Fix DJ deploy recipies. Refs #263
2012-04-05 22:26:18 +03:00
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04:00
349e173f60
[refs #295 ] deploy recipes for dj
2012-04-04 23:00:35 +06:00
06cd8a3c45
[refs #295 ] 4 workers to dj
2012-04-03 21:12:11 +06:00
1e8021fe35
[issue #369 ] Added TOS page.
2012-03-31 17:18:22 +04:00
0f597ad544
Merge pull request #368 from warpc/195-new_design_for_projects
...
[issue #195 ] Fixed access string in repo block
2012-03-31 03:39:52 -07:00
59f51d3b2f
[issue #195 ] read_access: read -> read-only
2012-03-31 14:36:36 +04:00
eb4679de0e
[issue #195 ] Fixed access string in repo block
2012-03-31 14:27:20 +04:00
d6e6959f46
Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349 , #263
2012-03-31 02:37:54 +03:00
4ce18b017e
Merge pull request #363 from warpc/195-new_design_for_projects
...
[issue #195 ] Added missed translations.
2012-03-30 13:51:07 -07:00
c70a7136d6
[issue #195 ] Fixed translations.
2012-03-31 00:47:49 +04:00
4e701dbddb
[issue #195 ] Added missed translations.
2012-03-31 00:20:23 +04:00
b8cadd8a22
[refs #340 ] changed translations for monitoring pages
2012-03-31 00:24:32 +06:00
4db9bf4587
[refs #340 ] add title to products page
2012-03-30 23:41:22 +06:00
d18e55f180
[refs #340 ] titles - part2
2012-03-30 22:37:54 +06:00
e14e2db6c3
[refs #340 ] first part of titles
2012-03-30 22:36:20 +06:00
3cedef5f07
Merge branch 'master' into 344-fix_products_monitoring
...
Conflicts:
db/schema.rb
2012-03-30 20:30:06 +04:00
d3c2bac226
[refs #344 ] Add product buils list filter and search
2012-03-30 15:26:28 +04:00
050398c39f
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-03-30 00:02:59 +03:00
583918fa68
Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263
2012-03-29 23:34:22 +03:00
34011513b5
[Refs #263 ] Remove old xml-rpc API
2012-03-29 23:19:00 +04:00
39c5da2445
[Refs #263 ] Remove EasyUrpmi support
2012-03-29 23:07:38 +04:00
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
5db485a4c0
[Refs #263 ] Remove Aut BuildList. Part 2
2012-03-29 22:43:46 +04:00
eac5461a29
Merge pull request #355 from warpc/195-new_design_for_projects
...
[issue #195 ] Fixed leave button. Added participant icons.
2012-03-29 09:29:37 -07:00
c03ae5015e
[issue #195 ] Fixed leave button. Added participant icons.
2012-03-29 20:27:33 +04:00
9a45353ccb
Merge pull request #342 from warpc/128-account-activation
...
[Refs #128 ] account activation
2012-03-29 09:09:03 -07:00
1d344f441f
[Refs #263 ] Fix localization: mistakes, typos and missing translations. Special thanks to Eugeni Dodonov for help.
2012-03-29 14:48:15 +04:00
69ccf18265
[refs #270 ] added statistics to admins menu
2012-03-28 19:19:42 +06:00
9ee350b007
Refactor search controllers and scopes. Add search query whitespace strip. Refs #263
2012-03-28 02:58:03 +03:00
baf35da99c
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
c327ca8d61
[refs #270 ] fixed translation for admin menu
2012-03-27 21:28:22 +06:00
f33ef75666
[refs #128 ] Add email confirmation on email change. Remove email confirmation after registration.
2012-03-27 17:45:09 +04:00
993d480a13
Merge pull request #341 from warpc/270-admins-menu
...
[refs #270 ] added register requests page to admins menu
2012-03-27 06:01:56 -07:00
6cac84e1bb
[refs #270 ] added register requests page to admins menu
2012-03-27 18:55:08 +06:00
3d2fedb594
[Refs #263 ] Speed up deploy if assets didn't change
2012-03-27 02:21:35 +04:00
5c574a74e4
* Fix for non en_US.UTF-8 user locale deploy
...
* Fix missing data in pingwinsoft application config
2012-03-26 23:18:33 +04:00
90024065a8
Change settings for pingwinsoft deploy env
2012-03-26 22:45:28 +04:00
dafedb3dcf
Reroute and refactor admin user creation to force invitation and self registration work correct. Refs #270
2012-03-26 17:49:00 +03:00
dd8e3b0497
[issue #195 ] Added JQuery datatables to /projects
2012-03-25 01:36:56 +04:00
0a2561549b
Merge pull request #339 from warpc/195-projects
...
[Refs #195 ] add lock/unlock icon, fixed edit button, changed translations
2012-03-23 12:26:30 -07:00
863d2999c8
[refs #195 ] changed translations
2012-03-24 01:15:34 +06:00
b08b1f7528
[refs #270 ] changed translation to Admin
2012-03-23 17:11:15 +06:00
7f31246463
Tune project specific build_lists page filters. Cleanup. Refs #223
2012-03-22 22:58:02 +02:00
df32afbda6
[Refs #265 ] change text for load_messages link
2012-03-22 22:35:01 +04:00
071c391a6e
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
9f23cf7727
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
524fa2302f
[issue #279 ] Changed buttons alignment.
2012-03-22 17:53:35 +04:00
fcc1fad0d1
[refs #270 ] fixed translations
2012-03-22 18:00:34 +06:00
90e027b8a6
Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190
2012-03-21 23:52:40 +02:00
89f31e9782
Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190
2012-03-21 21:55:14 +02:00
a6a5b722d2
[refs #270 ] use devise lockable to ban
2012-03-21 23:45:51 +06:00
4a6ce6c8a8
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
e2c1e59350
Merge pull request #314 from warpc/270-admins_menu
...
[Refs #270 ] created admins menu aside
2012-03-20 15:17:51 -07:00
5c408540ff
[refs #270 ] can ban user
2012-03-21 02:06:51 +06:00
4b4b718838
Fix errors in unicorn config
2012-03-20 23:11:59 +04:00
41d98f5040
Fix path for unicorn working_directory
2012-03-20 22:59:12 +04:00
abbe849f32
Fix(?) for zero time deploy restart
2012-03-20 22:47:09 +04:00
20ff998f08
[refs #270 ] user control
2012-03-21 00:12:18 +06:00
eb4a18c0ff
Merge pull request #319 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed bugs
2012-03-20 11:03:32 -07:00
f958c56a3e
[issue #279 ] Fixed typos
2012-03-20 21:44:56 +04:00
0dd0cb091c
Fix for unicorn zero deploy restarting
2012-03-20 20:54:51 +04:00
047425a27f
Merge pull request #318 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
a8b457a173
[issue #279 ] Fixed translation typo
2012-03-20 20:46:50 +04:00
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
1066307fbb
[refs #270 ] created admins menu aside
2012-03-19 23:32:02 +06:00
155a46cce9
[issue #279 ] Fixed some bugs in connection info.
2012-03-19 19:56:40 +04:00
8bf3837fcb
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-19 19:46:09 +04:00
ec791f2616
Fix for non restart unicorn with zero time deploy
...
http://unicorn.bogomips.org/SIGNALS.html (about 'preload_app')
2012-03-19 19:45:44 +04:00
b6b1462de5
[issue #279 ] Fixed some bugs in connection info.
2012-03-19 19:37:08 +04:00
ddc95c25fb
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-19 18:56:04 +04:00
1cbc3f5b7a
[issue #279 ] Added block of connection data for personal platform.
2012-03-19 18:46:12 +04:00
abe06b5068
Merge pull request #305 from warpc/223-monitoring_design
...
[Refs #223 ] monitoring design for current task
2012-03-19 03:28:30 -07:00
296acd80da
[refs #265 ] added build waiting message
2012-03-19 15:07:09 +06:00
b3d7091db0
Merge 3.2-master into 223-monitoring_design
2012-03-19 10:41:30 +04:00
4b26eebeca
[refs #223 ] Add new design to build list task page
2012-03-18 12:20:31 +04:00
86871ab32d
Merge branch '3.2-master' into 265-activity_feed_messages
...
Conflicts:
config/locales/menu.en.yml
config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
dd5f51de71
[refs #265 ] added build tasks feed
2012-03-16 21:37:58 +06:00
3d9f9b5c73
[issue #279 ] Fixed permissions and moved some buttons.
...
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04:00
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
dce26c79e0
[refs #265 ] fixed en locale
2012-03-16 00:25:05 +06:00
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06:00
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +04:00
5a77b17a43
[issue #279 ] Almost finished design for platforms
...
TODO:
* Add design for crontab generator
* Fix path generation
2012-03-14 21:22:47 +04:00
3642163fd7
[refs #265 ] changed feed messages
2012-03-14 23:00:26 +06:00
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
304141b1ba
[issue #279 ] Added views and removed datatables plugin
...
* Datatables plugin moved to lib.
* Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
cf009c7388
Fix routes. Refs #257
2012-03-12 22:34:42 +02:00
61b8c70f4b
[Refs #257 ] Fix edit profile labels
2012-03-12 22:13:10 +04:00
f6dd072a24
Merge branch '3.2-master' into 257-new_design_for_profiles
...
Conflicts:
config/locales/users.en.yml
config/locales/users.ru.yml
2012-03-12 23:04:31 +06:00
4fd91e2bfe
[refs #257 ] force convert avatar to jpg
2012-03-12 22:28:56 +06:00
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
a800b4364d
[refs #257 ] fixed translation
2012-03-12 18:52:32 +06:00
5f6ca140d9
[refs #257 ] add ability to destroy avatar
2012-03-12 18:51:07 +06:00
04622790fc
Merge pull request #289 from warpc/265-new_design_for_activity_feed
...
[refs #265 ] Work today builds statistics
2012-03-12 02:15:26 -07:00
ecfb4f81a0
[refs #265 ] fixed today builds
2012-03-12 14:52:38 +06:00
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
6f56a7787d
Merge pull request #267 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] Add first version of new design to activity feed
2012-03-11 10:33:47 -07:00
35d1323549
[refs #265 ] fixed message format
2012-03-11 23:30:14 +06:00
d86653e172
Split code and tracker options in notification center
2012-03-11 21:21:31 +04:00
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04:00
41cd1ddaf3
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
2012-03-07 23:34:49 +02:00
e49551756c
Merge pull request #276 from warpc/194-issue_page
...
[Refs #194 ] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
de62aaad53
[refs #257 ] fix user update registration page
2012-03-08 00:47:19 +06:00
464de82c68
[issue #274 ] Added some MIME types. Changed MIME ordering.
2012-03-07 17:36:39 +04:00
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
d6d8410b0f
[issue #274 ] Fixed file detection.
...
TODO.
1. Change MIME in editor
2. Change MIME sorting
2012-03-07 05:20:35 +04:00
7588a318da
Merge branch '3.2-master' into 265-new_design_for_activity_feed
...
Conflicts:
app/models/user.rb
2012-03-07 03:58:35 +06:00
4b9d0616d6
Merge branch '3.2-master' into 194-issue_page
...
Conflicts:
app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06:00
7308c4a0d2
Merge branch '3.2-master' into 255-search
...
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
2012-03-06 20:59:29 +02:00
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00
9565d58e8f
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-06 20:13:53 +04:00
d6f9b2c3e9
Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255
2012-03-06 17:53:04 +02:00
f54d889f74
[refs #265 ] Fix activity partials messages and locales. Fix observer.
2012-03-06 18:04:05 +04:00
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
637edabb4c
[refs #257 ] Fix some locales and headers
2012-03-05 22:00:44 +04:00
9d8eb8a3f2
Merge pull request #269 from warpc/195-new_design_for_projects
...
[Refs #195 ] Add blane functions. Fixed syntax highlighting. Stub for rpm-specs.
2012-03-05 09:07:36 -08:00
9214f79d91
[refs #265 ] Fix one more wiki compare route
2012-03-05 20:48:59 +04:00
8845ec17ff
[issue #195 ] Added translations.
2012-03-05 20:31:09 +04:00
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
c176304088
Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer.
2012-03-05 13:11:50 +04:00
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
ecff8d2d41
[refs #257 ] Add new design to notifier settings. Fix sidebar. Add edit btn to user profile
2012-03-03 13:23:30 +04:00
0dc22bae82
[refs #257 ] Add new design for users edit and private settings edit. Add new fields and action.
2012-03-03 12:01:32 +04:00
0c194f5b50
Fix DJ deploy callbacks. Remove capistrano-ext. Refs #263
2012-03-03 03:54:56 +02:00
159fbe65dc
Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263
2012-03-03 02:28:27 +02:00
56a12dc9ea
Merge branch 'master' into 3.2-master
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
2012-03-03 01:38:43 +02:00
6522650c5a
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
6bb3d36c81
Merge pull request #258 from warpc/230-error_messages
...
[refs #230 ] Fix error messages + some refactoring
2012-03-02 04:55:55 -08:00
7164dd580e
[refs #230 ] fix error messages + some refactoring
2012-03-02 18:27:38 +06:00
e147c2d6c5
[refs #257 ] Add new design for user public page. New field. Move locales to another file
2012-03-02 16:14:59 +04:00
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +04:00
d376b55a57
[refs #232 ] Move groups locales to another files. Remove unsused commented code. On small sidebar fix
2012-03-02 12:47:16 +04:00
f79c8d6f16
[refs #230 ] shorter error messages
2012-03-02 02:04:06 +02:00
d7dbe79357
[refs #230 ] edit password page
2012-03-02 02:04:06 +02:00
3aae663811
[refs #194 ] add comments to issues
2012-03-02 02:04:05 +02:00
036dfb6dd5
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-02 02:04:04 +02:00
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
eb689b7f18
[refs #232 ] Add new design and logic refactor for group members action
2012-03-01 19:41:40 +04:00
fc3d4c0b6d
[refs #232 ] Add group members edit page design
2012-03-01 18:23:26 +04:00
6eb239385a
[issue #195 ] Fixed bug with creating project
2012-03-01 17:37:35 +04:00
157f9a1a68
[refs #232 ] Add sidebar and group edit page
2012-03-01 16:28:38 +04:00
55ff2c7f6b
[refs #195 ] Change new project route and some other changes
2012-03-01 16:10:12 +04:00
2a4e978857
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-01 14:22:39 +04:00
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
bc96fcdcc3
[issue #195 ] Added missed translation.
2012-03-01 03:34:36 +04:00
cadd1995d1
[refs #230 ] fix forgot password SignUp style
2012-03-01 01:50:08 +06:00
d3231b5faa
Merge pull request #243 from warpc/230-registration_page
...
[Refs #230 ] Fix I18n and remove wrong js for registration page
2012-02-29 11:23:35 -08:00
Vokhmin Alexey V
Alexander Machehin
Vladimir Sharshov
konstantin.grabar
Pavel Chipiga
George Vinogradov
Pavel Shved
George Vinogradov
Pasha
konstantin.grabar