Alexander Machehin
|
345e4f698b
|
Merge branch 'master' into file-store-4_git_task
Conflicts:
Gemfile
|
2012-11-02 23:08:38 +06:00 |
Alexander Machehin
|
6d3a2e7bb3
|
Merge remote-tracking branch 'origin/file-store-4_git_task' into file-store-4_git_task
|
2012-11-01 23:39:08 +06:00 |
Alexander Machehin
|
84920c358a
|
[refs file-store-4] upload to file-store
|
2012-11-01 23:37:09 +06:00 |
Vokhmin Alexey V
|
36ae61cea0
|
#686: updated jbuilder gem
|
2012-10-17 16:18:05 +04:00 |
Vokhmin Alexey V
|
6bc3c4b9a8
|
#90: updated redhillonrails_core gem
|
2012-10-01 22:09:59 +04:00 |
Alexander Machehin
|
2b4e2f03e5
|
Merge pull request #585 from warpc/374-rest_api_for_builds
[refs #374] Add json responses for build lists api
|
2012-09-27 07:00:19 -07:00 |
Vladimir Sharshov
|
181e95a9d2
|
Moving Apidocs to separate project
|
2012-09-27 01:06:57 +04:00 |
konstantin.grabar
|
e94c6f4f00
|
[refs #374] Merge master into 374-rest_api_for_builds
|
2012-09-21 13:20:04 +04:00 |
Alexander Machehin
|
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 |
konstantin.grabar
|
15ec2c2c90
|
[refs #374] Add nanoc api docs
|
2012-09-07 20:55:48 +04:00 |
konstantin.grabar
|
58d9a972ef
|
[refs #374] Add rate limit
|
2012-09-04 22:48:14 +04:00 |
Alexander Machehin
|
d775fa0d08
|
[refs #616] ugly md preview
|
2012-08-29 21:24:06 +06:00 |
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 |
Pavel Chipiga
|
01a3572de0
|
Minor update. Fix helper bug. Minor refactor. Refs #263
|
2012-07-31 17:35:18 +03:00 |
Pavel Chipiga
|
27030566a4
|
Update rails, grit, gollum. Fix re-encoding bug. Refs #263
|
2012-07-30 02:32:23 +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 |
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
|
dc8a11fa68
|
[refs #505] Merge master into 505-state_machine_migrate
|
2012-06-19 13:43:38 +04:00 |
Pavel Chipiga
|
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 |
konstantin.grabar
|
76b261638f
|
Merge master into 505-state_machine_migrate
|
2012-06-14 10:34:55 +04:00 |
konstantin.grabar
|
f37e0e54a3
|
[refs #510] Replace dj with resque
|
2012-06-09 16:52:29 +04:00 |
konstantin.grabar
|
38b55d769f
|
[refs #510] Add resque async workers
|
2012-05-31 11:02:25 +04:00 |
konstantin.grabar
|
44de11d009
|
[refs #505] Add events, states and other base state machine logic
|
2012-05-28 21:47:53 +04:00 |
Pavel Chipiga
|
b1b5363972
|
Fix deploy. Redo main group route. Refs #263
|
2012-05-03 19:48:22 +03:00 |
Pavel Chipiga
|
7af06cc7ab
|
Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263
|
2012-04-23 23:55:42 +03:00 |
Pavel Chipiga
|
c0d2d67c73
|
Merge branch 'master' into 263-refactoring
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
|
2012-04-23 17:58:45 +03:00 |
Pavel Chipiga
|
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 |
George Vinogradov
|
71c8efabf9
|
[issue #347] Added backbone. Changed collaborators page.
|
2012-04-09 21:11:39 +04:00 |
Pavel Chipiga
|
531ba0a35f
|
Add rspec to dev env, change repo source. Take back rails_datatables to plugins with all files. Refs #263
|
2012-03-30 00:24:57 +03:00 |
Pavel Chipiga
|
050398c39f
|
Merge branch 'master' into 263-refactoring
Conflicts:
db/schema.rb
|
2012-03-30 00:02:59 +03:00 |
Pavel Chipiga
|
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 |
Vladimir Sharshov
|
4dd97d8c63
|
[Refs #263] Remove xml-rpc gem, clear CanCan abilities and tests
|
2012-03-30 00:24:45 +04:00 |
George Vinogradov
|
9bb1d80172
|
[issue #195] Added AJAX to /projects list.
|
2012-03-27 19:50:00 +04:00 |
Pavel Chipiga
|
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 |
konstantin.grabar
|
72c02282aa
|
[refs #232] Add mass-assignment fixes. Add create and mass-assig tests.
|
2012-03-21 17:52:35 +04:00 |
Pavel Chipiga
|
4b6b44d968
|
Fix deploy settings and gemfile
|
2012-03-12 00:28:34 +02:00 |
Pavel Chipiga
|
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 |
Pavel Chipiga
|
0c194f5b50
|
Fix DJ deploy callbacks. Remove capistrano-ext. Refs #263
|
2012-03-03 03:54:56 +02:00 |
Pavel Chipiga
|
13f0d8223d
|
Remove compass-bootstrap. Take back DJ fix. Refs #263
|
2012-03-03 02:42:10 +02:00 |
Pavel Chipiga
|
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 |
Pavel Chipiga
|
c177662e41
|
Upgrade gems. Hide uncancelable and unpublishable lins. Add duplicate build_list search link. Fix build_list display. Refs #223
|
2012-03-02 01:26:42 +02:00 |
Vladimir Sharshov
|
4e4130257f
|
Update Rails to 3.2.2 for security fixes
|
2012-03-02 00:17:10 +04:00 |
Pavel Chipiga
|
b7b69a86d8
|
Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96
|
2012-02-14 18:05:41 +02:00 |
Pavel Chipiga
|
7d74b0af13
|
Merge branch 'master' into 96-upgrade_rails
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
|
2012-02-14 02:14:03 +02:00 |
George Vinogradov
|
4dcc39975d
|
[issue #133] Fixed redirection bugs
|
2012-02-13 23:04:41 +04:00 |
Pavel Chipiga
|
704c544cbc
|
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
|
2012-02-10 18:33:16 +02:00 |
Pavel Chipiga
|
7223b7deb9
|
Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96
|
2012-02-09 01:46:25 +02:00 |
George Vinogradov
|
9730e5e095
|
[issue #64] DJ version set to 2.1.4
|
2012-02-02 18:29:35 +04:00 |
George Vinogradov
|
d0717c8f9e
|
[issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
Gemfile.lock
db/schema.rb
|
2012-02-01 22:39:04 +04:00 |
George Vinogradov
|
b117ec1331
|
[issue #64] Yet another hacks.
|
2012-02-01 22:33:53 +04:00 |
George Vinogradov
|
8733c4dc34
|
[issue #64] Some dirty hacks.
Diff for file with russian name don't work yet.
|
2012-02-01 03:20:42 +04:00 |
Pavel Chipiga
|
fde298cc85
|
Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112, #138
|
2012-01-31 20:48:37 +02:00 |
George Vinogradov
|
6f78e5456c
|
[issue #64] Changes for ruby 1.9.3 compatibility.
|
2012-01-31 20:40:46 +04:00 |
Vladimir Sharshov
|
7848681e2f
|
Remove unused gems, add newrelic support in development mode
|
2012-01-31 02:46:02 +04:00 |
George Vinogradov
|
24124766f4
|
[issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
Gemfile.lock
config/locales/en.yml
db/schema.rb
|
2012-01-31 02:07:11 +04:00 |
Pavel Chipiga
|
33dce21312
|
Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95
|
2012-01-30 22:36:58 +02:00 |
George Vinogradov
|
5f40030e30
|
[issue #64] Fixed bug with cloning wiki repository
|
2012-01-30 18:17:00 +04:00 |
George Vinogradov
|
2f315f869d
|
[issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
Gemfile.lock
app/models/project.rb
db/schema.rb
|
2012-01-30 13:27:22 +04:00 |
Pavel Chipiga
|
a1d7ee10e9
|
Redo indexes to schema_plus. Refs #112
|
2012-01-28 04:29:33 +02:00 |
Pavel Chipiga
|
43a4aecc66
|
Change indexes to composite, unique, case insensitive. Redo sync logging. Verbose params for tasks. Refs #112
|
2012-01-28 04:05:31 +02:00 |
George Vinogradov
|
324e9a294f
|
[issue #64] Fixed some bugs.
|
2012-01-27 22:30:45 +04:00 |
George Vinogradov
|
0cacdc9d4a
|
[issue #64] Fixed bug in migration
|
2012-01-27 18:38:33 +04:00 |
George Vinogradov
|
549f0a55e8
|
[issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
|
2012-01-27 18:27:23 +04:00 |
Vladimir Sharshov
|
aea6631e6d
|
Add NewRelic service support
|
2012-01-27 01:49:27 +04:00 |
Pavel Chipiga
|
3f4bf65825
|
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
|
2012-01-24 22:35:36 +02:00 |
George Vinogradov
|
81378478ca
|
[issue #64] Added Wiki controller and some methods in Project
|
2011-12-26 21:07:07 +04:00 |
Pavel Chipiga
|
045b8441f6
|
Apply basic bluepill configuration, write capistrano recipe for it. Change deploy logic to integrate with bluepill. Refactor unicorn config. Cleanup depoy. Refactor mount_downloads script. Write autostart script. Remove old scripts. Refactor platform mount/umount methods. Fix bugs. Refs #1
|
2011-12-13 23:48:25 +02:00 |
Pavel Chipiga
|
27668c7546
|
Fix dependencies. Refs #1
|
2011-12-13 15:17:32 +02:00 |
Pavel Chipiga
|
7e05c5b385
|
Improve and fix configs. Refs #2261
|
2011-12-06 20:35:46 +02:00 |
Pavel Chipiga
|
2bee3bd25d
|
Code cleanup. Redo deploy to unicorn. Refs #2261
|
2011-12-05 21:34:26 +02:00 |
Pavel Chipiga
|
37e7f757d9
|
Benchmark nginx upload module and save docs/configs. Turn off upload module temporary. Replace passenger to unicron, tune. Remove compass dependency to avoid deprecation message. Remove rake deprecation message. Tune import script. Refs #2261
|
2011-12-05 20:28:55 +02:00 |
Pavel Chipiga
|
d7c9452efa
|
Update gems. Redo exception catch for BuildServer.get_status. Write specs. Experiments with large file uploads. Refs #2261
|
2011-12-02 03:30:25 +02:00 |
konstantin.grabar
|
6d8e4f98b9
|
[refs #2249] Some ACL changes
|
2011-12-01 13:29:04 +04:00 |
Pavel Chipiga
|
02a813a474
|
Upgrade rails, devise and other gems. Refactor controllers. Fix application.yml config - remove unused keys and setup correct values for tests. Add product build lists status_build callback auth. Allow platform and project unixname uppercase. Write tests and fix bugs for ProductBuildList controller. Fix all unresolved test problems. Refs #2262
|
2011-11-26 02:54:40 +02:00 |
Vladimir Sharshov
|
158fc7dec2
|
Merge branch 'staging' of github.com:warpc/rosa-build into staging
Conflicts:
Gemfile
|
2011-11-25 22:45:58 +04:00 |
konstantin.grabar
|
c2202e8113
|
[refs #2249] Add projects controller specs
|
2011-11-25 20:23:10 +04:00 |
Vladimir Sharshov
|
86e96fa529
|
Allow run spec without RAILS_ENV=test
Remove unicorn
|
2011-11-25 19:16:04 +04:00 |
Pavel Chipiga
|
d49880f24e
|
Merge branch 'smart_http' into staging
Conflicts:
app/models/relation.rb
app/models/user.rb
|
2011-11-18 20:35:12 +02:00 |
Pavel Chipiga
|
3b36943b91
|
Remove gitolite and it callbacks. Add git repo create, destroy callbacks. Improve grack wrappers: separate read/write requests, ask password for push even for public repo, prepare for cancan, apply hooks, refactor. Fix auto_build_lists order. Refactor auto_build - move to model. Redo git_repo_url. Improve and test project import script. Fix bugs, refactor and cleanup. Refs #2243
|
2011-11-17 23:57:30 +02:00 |
konstantin.grabar
|
2772bddc06
|
[refs #2249] Add new rules. Fix joins trouble. Add new relations dynamic methods.
|
2011-11-17 23:34:02 +04:00 |
Pavel Chipiga
|
b2be92e4d1
|
Integrate grack into rails stack. Implement basic http auth for grack. Allow only downcase for uname and unixname. Refactor and code cleanup. Refs #2243
|
2011-11-15 23:58:27 +02:00 |
konstantin.grabar
|
827936a06c
|
Remove custom ACL calls. Add CanCan and some rules. Add bitmask_attribute
|
2011-11-16 00:05:08 +04:00 |
Pavel Chipiga
|
c5fdfcd39d
|
Fix sessions layout meta tags. Refs #2162
|
2011-11-10 01:50:51 +02:00 |
Vladimir Sharshov
|
0747c041c2
|
Update airbrake gem
|
2011-11-10 02:48:27 +04:00 |
Pavel Chipiga
|
5c97e89829
|
Fix gitolito update_key bug. Push project colaborators git. Fix key update. Hide colaborators groups. Improve RPC XML tests. Refactor and code cleanup. Refs #2162
|
2011-11-01 02:52:24 +02:00 |
Pavel Chipiga
|
0c3a044f81
|
Fix REXML Exception when using Unicorn or Passenger with XmlRPC. Add XML RPC events logging. Refactor. Improve after_rollback callback. Refs #2162
|
2011-10-30 18:46:52 +02:00 |
Pavel Chipiga
|
0171a0a42a
|
Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136
|
2011-10-26 23:57:51 +03:00 |
Ilya Krasilnikov
|
3915da75d4
|
Merge branch 'master' of github.com:warpc/rosa-build
|
2011-10-24 05:55:16 +04:00 |
Ilya Krasilnikov
|
ba617742a3
|
XML-PRC controller v1
|
2011-10-24 05:55:03 +04:00 |
George Vinogradov
|
82d72a851c
|
ACL for testing.
|
2011-10-24 01:39:44 +04:00 |
George Vinogradov
|
54c7c80af8
|
Merge branch 'master' of github.com:warpc/rosa-build
|
2011-10-22 19:57:26 +04:00 |
George Vinogradov
|
600a897490
|
Added route to roles controller.
|
2011-10-21 19:39:32 +04:00 |
Pavel Chipiga
|
644d57b420
|
Merge branch 'catalog'
Conflicts:
Gemfile
Gemfile.lock
app/views/layouts/application.html.haml
app/views/repositories/show.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
|
2011-10-21 17:55:41 +03:00 |
George Vinogradov
|
2dd99d32f9
|
Merge branch 'downloads'
First turn of merging.
Conflicts:
.gitignore
Gemfile
Gemfile.lock
config/locales/ru.yml
config/routes.rb
db/schema.rb
|
2011-10-20 19:22:11 +04:00 |
Pavel Chipiga
|
5291752419
|
Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858
|
2011-10-19 23:58:31 +03:00 |
George Vinogradov
|
ff36b1fdd3
|
Merge branch 'itima_web_refactoring'
Conflicts:
Gemfile
Gemfile.lock
app/models/user.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
|
2011-10-19 18:09:58 +04:00 |
santaux
|
8103b14e15
|
[refs #1861] Add downloads statistics
|
2011-10-14 10:35:25 +04:00 |
George Vinogradov
|
229b4bb3f4
|
Created new models and provided relationships between them.
|
2011-10-13 19:55:03 +04:00 |
Pavel Chipiga
|
77e03df70b
|
Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954
|
2011-10-11 23:56:51 +03:00 |
Vladimir Sharshov
|
f3d32273d8
|
Support Airbrake account
|
2011-09-29 17:24:33 +04:00 |