a4e2b6cfd1
[ #345 ] downgrade jquery-rails version because Sprockets::FileNotFound - couldn't find file 'jquery-ui'
2014-03-11 17:34:06 +06:00
d5f2e87f1c
[ #345 ] remove assets group from the Gemfile; fix compass-rails version
2014-03-11 17:21:06 +06:00
a81b5fc69e
Merge branch 'master' into 345-update_to_rails4
...
Conflicts:
Gemfile
Gemfile.lock
2014-03-07 16:25:32 +06:00
2e4112e6a4
Add skype notifications
2014-03-06 21:45:33 +06:00
0a80306095
[ #345 ] update gems
2014-03-06 13:44:14 +06:00
83689a94c4
[ #345 ] update rails & other gems
2014-02-27 16:33:16 +06:00
f8ba1d05a0
Cleanup
2014-02-27 00:50:39 +04:00
c5e3c7121e
Updated therubyracer
2014-02-25 23:19:41 +04:00
4250e31cdc
Merge branch 'master' into 354-add-possibility-to-rebuild-projects-periodically
...
Conflicts:
Gemfile.lock
2014-02-19 13:16:27 +04:00
782eef0664
update rails to 3.2.17
2014-02-19 02:54:57 +06:00
ea8bb0b42b
#354:added specs for autostart build_lists
2014-02-18 01:02:48 +04:00
0451c1eaa6
Merge branch 'master' into 347-update_paperclip
...
Conflicts:
Gemfile.lock
2014-02-12 21:36:16 +06:00
e889f23660
Configure resque-scheduler gem
2014-02-10 23:36:10 +04:00
2bcf8c39f3
[ #347 ] update paperclip gem; change file validations
2014-02-10 21:50:22 +06:00
00a630146f
#29 : updated whenever gem
2014-01-17 20:26:48 +04:00
e255c59261
[ #29 ] remove iconv
2014-01-16 19:39:03 +06:00
015c0375e8
#29 : updated gems, remove old code
2014-01-15 23:34:54 +04:00
e9079a6357
add therubyracer
2014-01-14 20:10:55 +06:00
4156789a60
[ #29 ] update grit
2014-01-10 11:40:18 +06:00
90406d5000
[ #29 ] update grit
2014-01-10 11:11:00 +06:00
50735fc977
[ #29 ] add iconv gem
2014-01-10 09:30:22 +06:00
0cb585ef71
Merge branch 'master' into 29-migrate-to-ruby-2.1
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/activity_feeds_controller.rb
app/models/activity_feed_observer.rb
config/environments/development.rb
config/initializers/a_app_config.rb
config/initializers/airbrake.rb
lib/modules/models/git.rb
spec/controllers/activity_feeds_controller_spec.rb
spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
08d51391e7
Updated puma && newrelic_rpm gems
2013-12-10 00:15:59 +04:00
9612ccdf19
Move git repository to rosa-abf
2013-12-06 14:21:20 +06:00
9243d54a68
Merge branch 'master' into puma
2013-12-04 13:56:20 +06:00
d6a55e57a7
Update rails to 3.2.16
2013-12-04 13:55:35 +06:00
561d886a54
updated newrelic_rpm gem
2013-11-28 17:57:09 +04:00
5e5f5f3f07
Added puma gem
2013-11-27 21:07:18 +04:00
f4f9ba5409
#312 : added RpmBuildNode model, fetch statistics
2013-11-09 01:14:04 +04:00
fafc898059
Added localeapp gem
2013-11-08 20:31:28 +04:00
21efb631b6
Rollback source of gems
2013-11-07 02:06:59 +04:00
bd29b5ef13
Use http://rubygems.org/
2013-11-07 01:27:19 +04:00
78d1adcfa3
added logglier gem
2013-11-07 01:22:13 +04:00
b2a1fe1533
#272 : use Rollbar and logentries
2013-09-27 15:49:11 +04:00
7c0135edc1
#298 : use native extensions
2013-09-11 19:16:18 +04:00
a160318368
#291 : use GitHub repo
2013-09-02 20:40:52 +04:00
a581a96e63
#291 : rollback Grack
2013-09-02 20:31:59 +04:00
d65214b5df
try new grack
2013-09-02 14:36:27 +06:00
5bebaca4f0
#291 : added friendly_id
2013-09-01 19:33:09 +04:00
36259776a1
#267 : added sound notifications
2013-08-20 23:10:24 +04:00
e63592e6ac
#258 : removed backbone gem, small JS changes
2013-08-08 16:30:53 +04:00
a91bfe95c9
#251 : added js-routes gem, updated JS
2013-08-05 21:38:48 +04:00
b3ab16ec09
#251 : use AJAX for load data on BuildList#index page
2013-08-02 02:24:33 +04:00
a8d76474aa
[ #200 ] update reqsue gems
2013-07-24 17:43:49 +06:00
78a33727a6
#214 : merge master into branch
2013-07-19 21:08:00 +04:00
cf436203d9
#214 : updated version of angular-i18n gem
2013-07-19 16:58:23 +04:00
c44b4ffda2
#214 : added "angular-i18n" gem, some refactoring
2013-07-19 16:34:55 +04:00
ef02f33a42
#219 : updated jbuilder gem
2013-07-16 17:21:59 +04:00
7586f5ee1b
#219 : use redis_store as Rails cache_store
2013-07-16 16:00:32 +04:00
d90ba55a08
#214 : updated Gemfile.lock
2013-07-15 18:08:28 +04:00
a37a23266f
#214 : added DateTime formatter
2013-07-15 14:11:17 +04:00
fe8e1216c5
#214 : remove unnecessary code
2013-07-12 23:27:49 +04:00
2e33f0038a
#214 : added ability to destroy branch
2013-07-11 17:03:02 +04:00
d747ffd070
#214 : updated #branches page, integrated AngularJS
2013-07-11 14:34:44 +04:00
b843652cff
#188 : added .travis.yml
2013-06-14 17:04:17 +04:00
7f4b64845a
update airbrake to current stable version
2013-06-03 23:35:35 +06:00
f8d0320d23
#34 : added new hooks, some refactoring according to Alexander's comments
2013-04-15 17:34:11 +04:00
0f95623470
Merge pull request #57 from abf/rosa-build:30-social-login-and-open-registration
...
[refs #30 ]: Social login and open registration
2013-04-10 16:52:50 +04:00
7d7df64611
[ #19 ] restore codemirror highlight for comments code
2013-04-05 17:34:22 +06:00
ac678ee520
#29 : update "grit" gem
2013-04-03 16:50:01 +04:00
9e7eb7af94
#29 : merge master into branch
2013-04-03 16:10:22 +04:00
e78e73cae8
[ #19 ] add gitlabhq markdown
2013-03-29 00:22:24 +06:00
c2e89f8781
#30 : use omniauth for registration through Facebook, GitHub, Google
2013-03-26 03:13:15 +04:00
7d1c5f381b
restore redhillonrails_core gem
2013-03-19 18:30:34 +06:00
d3469f524a
update rails to 3.2.13 && gems update
2013-03-19 15:15:14 +06:00
089865270a
#29 : update rails
2013-03-18 19:13:43 +04:00
29eed84f7d
#29 : update "newrelic_rpm" and fix "undefined method empty? for nil:NilClass"
2013-03-18 16:42:45 +04:00
6bb2188c2f
update path to rubygems.org in Gemfile.lock
2013-03-11 16:32:11 +04:00
5a8ed6124a
remove "json" gem from Gemfile
2013-02-12 13:06:04 +04:00
8aeda1f087
Update "rails" and "json" gems
2013-02-12 12:57:03 +04:00
6478f4a3b1
Denial of Service and Unsafe Object Creation Vulnerability in JSON [CVE-2013-0269]
2013-02-11 22:36:53 +04:00
7868434f99
#883 : update "newrelic_rpm" gem, bundle update
2013-02-04 19:19:04 +04:00
87be12a6b7
Fix error with avatars:
...
[paperclip] An error was received while processing:
Paperclip::Errors::NotIdentifiedByImageMagickError: ... is not recognized by the 'identify' command.
2013-02-04 00:44:33 +06:00
c1cbda5fdc
#860 : bundle update
2013-01-29 18:42:39 +04:00
9297699a79
[refs #811 ] add Turbo Sprockets
2013-01-25 13:18:50 +06:00
b1606d9241
#794 : bundle update
2013-01-18 20:04:17 +04:00
097ffacf61
#794 : merge master into branch
2013-01-16 19:07:39 +04:00
71125eac81
update rails to 3.2.11
2013-01-09 14:25:21 +06:00
2a5a955bfb
[refs #796 ] use MockRedis in specs
2012-12-26 19:07:54 +06:00
0ad9932561
#794 : fixes for failed specs
2012-12-20 22:50:55 +04:00
334b078855
#794 : update KeyPair model, write migration
2012-12-19 22:18:00 +04:00
8757724acc
#778 : update rails gem, update destroy Platform and Reposytory
2012-12-17 16:28:17 +04:00
345e4f698b
Merge branch 'master' into file-store-4_git_task
...
Conflicts:
Gemfile
2012-11-02 23:08:38 +06:00
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
84920c358a
[refs file-store-4] upload to file-store
2012-11-01 23:37:09 +06:00
36ae61cea0
#686 : updated jbuilder gem
2012-10-17 16:18:05 +04:00
6bc3c4b9a8
#90 : updated redhillonrails_core gem
2012-10-01 22:09:59 +04:00
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
181e95a9d2
Moving Apidocs to separate project
2012-09-27 01:06:57 +04:00
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +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
15ec2c2c90
[refs #374 ] Add nanoc api docs
2012-09-07 20:55:48 +04:00
58d9a972ef
[refs #374 ] Add rate limit
2012-09-04 22:48:14 +04:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06: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
01a3572de0
Minor update. Fix helper bug. Minor refactor. Refs #263
2012-07-31 17:35:18 +03:00
27030566a4
Update rails, grit, gollum. Fix re-encoding bug. Refs #263
2012-07-30 02:32:23 +03: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
dc8a11fa68
[refs #505 ] Merge master into 505-state_machine_migrate
2012-06-19 13:43:38 +04: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
76b261638f
Merge master into 505-state_machine_migrate
2012-06-14 10:34:55 +04:00
f37e0e54a3
[refs #510 ] Replace dj with resque
2012-06-09 16:52:29 +04:00
38b55d769f
[refs #510 ] Add resque async workers
2012-05-31 11:02:25 +04:00
44de11d009
[refs #505 ] Add events, states and other base state machine logic
2012-05-28 21:47:53 +04:00
b1b5363972
Fix deploy. Redo main group route. Refs #263
2012-05-03 19:48:22 +03:00
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
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03: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
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
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
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
4dd97d8c63
[Refs #263 ] Remove xml-rpc gem, clear CanCan abilities and tests
2012-03-30 00:24:45 +04:00
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04: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
72c02282aa
[refs #232 ] Add mass-assignment fixes. Add create and mass-assig tests.
2012-03-21 17:52:35 +04:00
4b6b44d968
Fix deploy settings and gemfile
2012-03-12 00:28:34 +02: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
0c194f5b50
Fix DJ deploy callbacks. Remove capistrano-ext. Refs #263
2012-03-03 03:54:56 +02:00
13f0d8223d
Remove compass-bootstrap. Take back DJ fix. Refs #263
2012-03-03 02:42:10 +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
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
4e4130257f
Update Rails to 3.2.2 for security fixes
2012-03-02 00:17:10 +04:00
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
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
4dcc39975d
[issue #133 ] Fixed redirection bugs
2012-02-13 23:04:41 +04:00
704c544cbc
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
2012-02-10 18:33:16 +02:00
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
9730e5e095
[issue #64 ] DJ version set to 2.1.4
2012-02-02 18:29:35 +04:00
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
b117ec1331
[issue #64 ] Yet another hacks.
2012-02-01 22:33:53 +04:00
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
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
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
7848681e2f
Remove unused gems, add newrelic support in development mode
2012-01-31 02:46:02 +04:00
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
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
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +04:00
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
a1d7ee10e9
Redo indexes to schema_plus. Refs #112
2012-01-28 04:29:33 +02:00
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
324e9a294f
[issue #64 ] Fixed some bugs.
2012-01-27 22:30:45 +04:00
0cacdc9d4a
[issue #64 ] Fixed bug in migration
2012-01-27 18:38:33 +04:00
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
aea6631e6d
Add NewRelic service support
2012-01-27 01:49:27 +04:00
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04:00
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
27668c7546
Fix dependencies. Refs #1
2011-12-13 15:17:32 +02:00
Alexander Machehin
Vokhmin Alexey V
warpc
konstantin.grabar
Pavel Chipiga
George Vinogradov