bfe99a1eee
Consolidate unicorn worker advise.
2014-12-08 14:41:45 +01:00
acf1844897
Merge branch 'unicorn-advice' into 'master'
...
Unicorn advice
See merge request !1314
2014-12-08 13:30:20 +00:00
f811b695f8
memory constrained unicorn workers
2014-12-08 14:21:17 +01:00
7d662114b3
Merge branch 'sidekiq_memory_killer_grace_time' into 'master'
...
Add 'grace time' behavior to Sidekiq MemoryKiller
The previous iteration of the memory killer did not give 'large'
jobs much of a chance to finish. This caused them to come back after
each restart, leading to another memory-induced shutdown. By adding
some 'grace time' between the moment we detect a memory peak and
the moment we start shutting down, we hope to give Sidekiq a chance
to get whatever causes its memory to grow 'out of its system'.
See merge request !1313
2014-12-08 13:17:10 +00:00
b7d4184f24
advise about unicorn workers
2014-12-08 13:51:27 +01:00
b8dfd63eac
Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable
2014-12-08 13:39:25 +01:00
2fcef3278c
Fix typo
2014-12-08 13:39:18 +01:00
3dd86b83ba
Use constants instead of getters
2014-12-08 13:19:31 +01:00
bbf9953b99
Merge branch 'attachment_url_shouldnot_be_overwritten' into 'master'
...
Attachment url should not be overwritten
Fixes #1786
See merge request !1308
2014-12-07 20:51:54 +00:00
1812c1d4de
Merge branch 'improved-monokai' into 'master'
...
Improve Monokai highlight style to match original
The current monokai style is not very true to the original and lacks colors for certain syntactic items as mentioned in ticket https://github.com/gitlabhq/gitlabhq/issues/6855 . This change's goal is to bring the monokai highlight style in line with the original design from http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
Before:
After:
See merge request !238
2014-12-07 13:34:37 +00:00
94ea4f4296
Merge branch 'improve-activity-ui' into 'master'
...
Improve activity UI
See merge request !1311
2014-12-07 12:50:06 +00:00
8c727feea6
Merge branch 'small-fixes' into 'master'
...
Small fixes
Improve application stability over unexpected cases
See merge request !1310
2014-12-07 12:49:48 +00:00
f59032e73a
Merge branch 'async-services' into 'master'
...
Async services
Fixes #1814
See merge request !1312
2014-12-07 12:49:12 +00:00
0d5265bbec
Execute project services asynchronously
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-07 12:29:37 +02:00
04fa03a7d8
Bolder event title and lighter color for event body
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-06 18:22:19 +02:00
2a494d99fa
Update CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 18:30:50 +02:00
4f9a14061b
Wait 15 minutes before Sidekiq MemoryKiller action
2014-12-05 17:29:34 +01:00
bf91fb9274
Merge branch 'author-filter' into 'master'
...
Author filter for issues and merge requests pages
This is first step in implementing #1604
See merge request !1309
2014-12-05 16:27:53 +00:00
4491a3d12b
Decline push if repository does not exist
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 18:17:51 +02:00
7cefd9c6ef
Prevent 500 on MR page if merge_event missing
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 18:10:25 +02:00
c8a96d8ab0
More tests for issues finder
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 17:25:22 +02:00
e0f30c605b
Add author filter for issues & merge requests pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 17:13:07 +02:00
3f1fad5f09
Add an avatar_url spec when relative url is set.
2014-12-05 15:59:55 +01:00
ed2eaf55c1
Move issues/mr filter to partial
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 16:59:17 +02:00
eb12e3ab56
Merge branch 'mr-lock-problem' into 'master'
...
Fix merge request lock problem
Merge Request lock problem
MR can be stuck in lock state if satelitte timeout >= unicorn timeout.
Issue explanation:
* Person press Accept button
* unicorn worker starts, lock MR and trigger satellite
* satellite does merge but very long (30 seconds)
* unicorn timeout reaches earlier then satellite timeout
* unicorn kills worker because of timeout leaving MR in lock state.
Fix:
* set locked_at date
* if MR was locked for too long - close it automatically
- - -
Fixes #1674
See merge request !1306
2014-12-05 14:52:19 +00:00
805e61cee5
Merge branch 'doc/snapshot_backups' into 'master'
...
Add snapshot backup tips
See merge request !1307
2014-12-05 14:44:07 +00:00
db585009be
Revert "Merge pull request #7349 from srna/patch-1"
...
This reverts commit b37b71d88742a1d8083c
2014-12-05 15:33:22 +01:00
8f0b558aaa
Add snapshot backup tips
2014-12-05 15:29:45 +01:00
6487419364
Automatically close merge requests that were locker for 1 day
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 16:02:08 +02:00
b23f71ec4d
Set/unset merge request locked_at timestamp after transition
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 15:49:25 +02:00
1961b59070
Add locked_at to merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 15:42:26 +02:00
1521867219
Merge branch 'release_docs_improvements' into 'master'
...
Release docs improvements
Fixes #1734
See merge request !1305
2014-12-05 13:32:07 +00:00
54d32f565e
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-12-05 13:40:40 +01:00
3a3471cc2e
Update favorites to the new link.
2014-12-05 13:40:11 +01:00
69e8b0e9fd
Merge branch '512mb-memory-description' into 'master'
...
512mb memory description
See merge request !1297
2014-12-05 11:37:37 +00:00
90a308ea00
Update release docs to deploy to GitLab.com before publishing.
2014-12-05 12:34:18 +01:00
e6c5a8b161
Merge branch 'rake_task_for_google_email_schema_verfication' into 'master'
...
Rake task for google email schema verfication
#1607
See merge request !1300
2014-12-05 10:19:10 +00:00
9ce9814ee3
Merge branch 'dev-rake-task-docs' into 'master'
...
Dev rake task docs
As discussed in #1184
See merge request !1301
2014-12-04 21:03:46 +00:00
9932f9e423
Merge branch 'refactor-atom-code' into 'master'
...
Refactor atom code
See merge request !1304
2014-12-04 21:01:56 +00:00
82a8bc4498
Merge branch 'atom-feed-for-user' into 'master'
...
Atom feed for user
This feature allows to subscribe for users activity via atom feed.
See merge request !1303
2014-12-04 21:00:44 +00:00
3dc25ba331
Remove warning from db seed since it is called by db setup.
2014-12-04 21:22:21 +01:00
d31d711a70
DRY and refactor atom code
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 22:14:20 +02:00
a46fe875c6
Feature: atom feed for user activity
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 21:49:19 +02:00
05d713be19
Merge branch 'sidekiq-2.17.8' into 'master'
...
Sidekiq 2.17.8
See merge request !1277
2014-12-04 19:11:02 +00:00
288df41c0a
Seed is not seed dump.
2014-12-04 18:14:54 +01:00
18164afbcc
Update Sidekiq to 2.17.8
2014-12-04 18:11:49 +01:00
d7fa9952ef
Merge branch 'prevent-500-test-webhook' into 'master'
...
Prevent 500 test webhook
Fixes #1803
See merge request !1299
2014-12-04 16:03:42 +00:00
e1f1e062a8
Merge branch 'multi_provider' into 'master'
...
Supporting for multiple omniauth provider for the same user
fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721
and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760
See merge request !1296
2014-12-04 16:03:04 +00:00
704b7237e6
Fix notifications for developers that don't read the documentation.
2014-12-04 16:54:08 +01:00
cdc62cffcb
Add rake task for google schema whitelisting.
2014-12-04 15:22:10 +01:00
Sytse Sijbrandij
Sytse Sijbrandij
Job van der Voort
Dmitriy Zaporozhets
Jacob Vosmaer
Dmitriy Zaporozhets
Marin Jankovski
Marin Jankovski
