home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,947 Commits 48 Branches 340 Tags
eceda17f0911bd62dba83d193df680f7cedc8cd9
Commit Graph
12947 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski eceda17f09 Markdown dropzone image icon should not be clickable. 2014-12-10 17:24:11 +01:00
Sytse Sijbrandij 3febfce1ae Merge branch 'doc/file_read' into 'master' 
Add security tips about file and paths

These are some extra guidelines to guard against code execution and path traversal.

See merge request !1317
 2014-12-09 15:48:21 +00:00
Jacob Vosmaer 82eb0a44d7 Add security tips about file and paths 2014-12-09 14:51:15 +01:00
Dmitriy Zaporozhets c7db2661a5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-12-08 16:31:42 +02:00
Dmitriy Zaporozhets 15d5b287e2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-08 16:03:36 +02:00
Dmitriy Zaporozhets 754c38bb6a Merge branch 'speed_up_migration' into 'master' 
Speed up omniauth AddIdentityTable migration

https://dev.gitlab.org/gitlab/gitlabhq/issues/1810

See merge request !1315
 2014-12-08 14:03:17 +00:00
Job van der Voort 0e32b3c0c1 Merge branch 'unicorn-workers' into 'master' 
Unicorn workers

See merge request !1316
 2014-12-08 13:52:29 +00:00
Sytse Sijbrandij bfe99a1eee Consolidate unicorn worker advise. 2014-12-08 14:41:45 +01:00
Sytse Sijbrandij acf1844897 Merge branch 'unicorn-advice' into 'master' 
Unicorn advice

See merge request !1314
 2014-12-08 13:30:20 +00:00
Job van der Voort f811b695f8 memory constrained unicorn workers 2014-12-08 14:21:17 +01:00
Dmitriy Zaporozhets 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
Valery Sizov 7d8dfccf70 speed up migration to identities 2014-12-08 15:15:11 +02:00
Job van der Voort b7d4184f24 advise about unicorn workers 2014-12-08 13:51:27 +01:00
Jacob Vosmaer b8dfd63eac Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable 2014-12-08 13:39:25 +01:00
Jacob Vosmaer 2fcef3278c Fix typo 2014-12-08 13:39:18 +01:00
Sytse Sijbrandij e2724c224e Merge branch 'tracker_guidelines' into 'master' 
Drop vagrant from issue tracker guidelines

Is this the preferred method of reproducing an issue? If yes, disregard this MR.

\cc @sytses @marin

See merge request !255
 2014-12-08 12:35:14 +00:00
Jacob Vosmaer 3dd86b83ba Use constants instead of getters 2014-12-08 13:19:31 +01:00
Jacob Vosmaer 1caf5cbe07 Merge pull request #8436 from Razer6/move_doc_to_folder 
Move sidekiq debug docs to development folder
 2014-12-08 13:15:58 +01:00
Achilleas Pipinellis 3dd6244651 Drop vagrant preference in issue tracker guidelines. 2014-12-08 13:45:02 +02:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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:
![monokai-old](https://gitlab.com/uploads/klowner/gitlab-ce/ce96c7d7c2/monokai-old.png)

After:
![monokai](https://gitlab.com/uploads/klowner/gitlab-ce/b257a8143a/monokai.png)

See merge request !238
 2014-12-07 13:34:37 +00:00
Dmitriy Zaporozhets 94ea4f4296 Merge branch 'improve-activity-ui' into 'master' 
Improve activity UI

See merge request !1311
 2014-12-07 12:50:06 +00:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets f59032e73a Merge branch 'async-services' into 'master' 
Async services

Fixes #1814

See merge request !1312
 2014-12-07 12:49:12 +00:00
Dmitriy Zaporozhets 0d5265bbec Execute project services asynchronously 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-07 12:29:37 +02:00
Robert Schilling 369375d086 Move sidekiq debug docs to development folder 2014-12-07 01:24:03 +01:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 2a494d99fa Update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 18:30:50 +02:00
Jacob Vosmaer 4f9a14061b Wait 15 minutes before Sidekiq MemoryKiller action 2014-12-05 17:29:34 +01:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets c8a96d8ab0 More tests for issues finder 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 17:25:22 +02:00
Dmitriy Zaporozhets 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
Marin Jankovski 3f1fad5f09 Add an avatar_url spec when relative url is set. 2014-12-05 15:59:55 +01:00
Dmitriy Zaporozhets ed2eaf55c1 Move issues/mr filter to partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:59:17 +02:00
Dmitriy Zaporozhets 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
Sytse Sijbrandij 805e61cee5 Merge branch 'doc/snapshot_backups' into 'master' 
Add snapshot backup tips

See merge request !1307
 2014-12-05 14:44:07 +00:00
Marin Jankovski db585009be Revert "Merge pull request #7349 from srna/patch-1" 
This reverts commit b37b71d887, reversing
changes made to 42a1d8083c.
 2014-12-05 15:33:22 +01:00
Jacob Vosmaer 8f0b558aaa Add snapshot backup tips 2014-12-05 15:29:45 +01:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 1961b59070 Add locked_at to merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:42:26 +02:00
Dmitriy Zaporozhets 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
Sytse Sijbrandij 54d32f565e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-05 13:40:40 +01:00
Sytse Sijbrandij 3a3471cc2e Update favorites to the new link. 2014-12-05 13:40:11 +01:00
Marin Jankovski 69e8b0e9fd Merge branch '512mb-memory-description' into 'master' 
512mb memory description

See merge request !1297
 2014-12-05 11:37:37 +00:00
Marin Jankovski 90a308ea00 Update release docs to deploy to GitLab.com before publishing. 2014-12-05 12:34:18 +01:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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