Alexander Machehin
|
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 |
Vokhmin Alexey V
|
a16682c5f9
|
#336: small refactoring
|
2014-01-10 03:01:01 +04:00 |
|
Vokhmin Alexey V
|
4b4b1fe5d8
|
#336: rollback changes
|
2014-01-10 02:57:44 +04:00 |
|
Vokhmin Alexey V
|
6a6fcc321f
|
#336: use set instead of list
|
2014-01-10 02:56:11 +04:00 |
|
Vokhmin Alexey V
|
df83fe65e1
|
#336: added ability for clean up packages from testing repository
|
2014-01-10 00:54:48 +04:00 |
|
avm
|
ad4b25d281
|
Merge pull request #334 from abf/rosa-build:fix-too-long-rendering
too long rendering
|
2013-12-30 20:21:27 +04:00 |
|
Vokhmin Alexey V
|
58025f8681
|
small refactoring
|
2013-12-30 20:19:20 +04:00 |
|
Vokhmin Alexey V
|
d04f276f1d
|
updated concatenation operation
|
2013-12-30 20:08:42 +04:00 |
|
Alexander Machehin
|
7b8798c974
|
Change TOS to actual
|
2013-12-16 19:48:10 +06:00 |
|
Alexander Machehin
|
b05e9577ce
|
Merge branch 'master' into puma
|
2013-12-10 14:57:12 +06:00 |
|
Alexander Machehin
|
f5b7499775
|
change TOS
|
2013-12-10 14:56:56 +06:00 |
|
Vokhmin Alexey V
|
08d51391e7
|
Updated puma && newrelic_rpm gems
|
2013-12-10 00:15:59 +04:00 |
|
Alexander Machehin
|
9612ccdf19
|
Move git repository to rosa-abf
|
2013-12-06 14:21:20 +06:00 |
|
Alexander Machehin
|
31e9e7fca8
|
Decrease count of workers
|
2013-12-06 14:10:08 +06:00 |
|
Alexander Machehin
|
9243d54a68
|
Merge branch 'master' into puma
|
2013-12-04 13:56:20 +06:00 |
|
Alexander Machehin
|
d6a55e57a7
|
Update rails to 3.2.16
|
2013-12-04 13:55:35 +06:00 |
|
Vokhmin Alexey V
|
b8b7076111
|
increase count of workers
|
2013-12-03 15:09:03 +04:00 |
|
Alexander Machehin
|
b7f78c4209
|
Merge branch 'master' into puma
|
2013-12-03 16:59:27 +06:00 |
|
Alexander Machehin
|
a5d54d2694
|
fix showing build list
|
2013-12-03 16:55:33 +06:00 |
|
Vokhmin Alexey V
|
1ac803294c
|
Rollback config/puma/production.rb
|
2013-12-02 17:53:33 +04:00 |
|
Vokhmin Alexey V
|
0fdc86c62c
|
Decrease count of workers
|
2013-12-02 17:27:20 +04:00 |
|
Vokhmin Alexey V
|
e76dd21275
|
Increase count of threads
|
2013-12-02 17:10:43 +04:00 |
|
Vokhmin Alexey V
|
ffd7232692
|
Decrease count of threads
|
2013-12-02 16:49:50 +04:00 |
|
Vokhmin Alexey V
|
b4a07c12be
|
Merge branch 'master' into puma
|
2013-11-29 16:59:06 +04:00 |
|
Vokhmin Alexey V
|
bee08c01cf
|
Skip build_lists for red3 platfrom
|
2013-11-29 16:58:37 +04:00 |
|
Vokhmin Alexey V
|
94e2270ff6
|
Updated deploy sample
|
2013-11-28 19:23:37 +04:00 |
|
Vokhmin Alexey V
|
05609a4157
|
Updated config/newrelic.yml.sample
|
2013-11-28 18:28:44 +04:00 |
|
Vokhmin Alexey V
|
561d886a54
|
updated newrelic_rpm gem
|
2013-11-28 17:57:09 +04:00 |
|
Vokhmin Alexey V
|
9f1abe17ac
|
updated path to puma.state
|
2013-11-27 23:27:08 +04:00 |
|
Vokhmin Alexey V
|
03cec85116
|
updated puma comfigs
|
2013-11-27 23:20:41 +04:00 |
|
Vokhmin Alexey V
|
c285b93f08
|
updated puma recipes
|
2013-11-27 23:18:01 +04:00 |
|
Vokhmin Alexey V
|
fe6b9ee68f
|
remove unnecessary code
|
2013-11-27 22:25:55 +04:00 |
|
Vokhmin Alexey V
|
c89dcc9013
|
added production.rb configs for puma
|
2013-11-27 22:20:05 +04:00 |
|
Vokhmin Alexey V
|
199006dc69
|
Set ENV
|
2013-11-27 21:36:46 +04:00 |
|
Vokhmin Alexey V
|
bda2eaa740
|
Updated puma.rb config
|
2013-11-27 21:28:19 +04:00 |
|
Vokhmin Alexey V
|
d8ab1588ab
|
Updated puma.rb recipes
|
2013-11-27 21:17:27 +04:00 |
|
Vokhmin Alexey V
|
39a6ee9635
|
updated puma options
|
2013-11-27 21:10:02 +04:00 |
|
Vokhmin Alexey V
|
5e5f5f3f07
|
Added puma gem
|
2013-11-27 21:07:18 +04:00 |
|
Vokhmin Alexey V
|
de7b60fac2
|
Rollback changes
|
2013-11-27 20:35:01 +04:00 |
|
Vokhmin Alexey V
|
858a348544
|
Updated unicorn.rb
|
2013-11-27 20:20:47 +04:00 |
|
Vokhmin Alexey V
|
4cd20c7045
|
Temporally disable logglier
|
2013-11-27 20:20:06 +04:00 |
|
Vokhmin Alexey V
|
c4dca3d452
|
Updated jobs_controller
|
2013-11-27 19:52:37 +04:00 |
|
Vokhmin Alexey V
|
c2f6774479
|
Temporally hook...
|
2013-11-27 16:25:44 +04:00 |
|
avokhmin
|
e40c076a38
|
Merge pull request #329 from abf/rosa-build:328-post-commit-hooks-to-email-updates
#328: post-commit hooks to email updates
|
2013-11-27 13:32:04 +04:00 |
|
Vokhmin Alexey V
|
9ab0e1be6f
|
#328: rename field: new_commit to update_code
|
2013-11-27 13:28:11 +04:00 |
|
Vokhmin Alexey V
|
f064e19249
|
Fixed repository_spec.rb
|
2013-11-27 00:45:18 +04:00 |
|
Vokhmin Alexey V
|
aad38f9358
|
#328: update locales according to Alexander's comments
|
2013-11-26 22:58:28 +04:00 |
|
Vokhmin Alexey V
|
b4a524575d
|
#328: updated urls in email
|
2013-11-26 22:39:30 +04:00 |
|
Vokhmin Alexey V
|
17b3ac4c23
|
#328: rollback changes
|
2013-11-26 22:19:29 +04:00 |
|
Vokhmin Alexey V
|
00368aff60
|
#328: fixed I18n
|
2013-11-26 22:08:30 +04:00 |