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 |
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
|
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 |
George Vinogradov
|
9bb1d80172
|
[issue #195] Added AJAX to /projects list.
|
2012-03-27 19:50:00 +04:00 |
Pavel Chipiga
|
4553affa56
|
Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190, #134
|
2012-03-22 19:11:12 +02: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 |
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 |
George Vinogradov
|
edef21068d
|
[issue #174] Fixed bug with RegisterRequest
|
2012-02-10 01:44:47 +04: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 |
Vladimir Sharshov
|
b4be56d518
|
Remove unused gems
|
2012-02-03 00:34:55 +04: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 |