home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,988 Commits 48 Branches 340 Tags
9fc739e5d03072cd2e7dc09505c413eef2180956
Commit Graph
12988 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij 9fc739e5d0 Merge pull request #8447 from jvanbaarsen/added-code-of-conduct 
Added Code of Conduct
 2014-12-15 09:34:54 +01:00
Jeroen van Baarsen be206a5142 Merge pull request #8410 from tricknotes/add-webhook-doc-for-tag-event 
Add missing webhook doc for tag event
 2014-12-14 18:35:31 +01:00
Jeroen van Baarsen 6b1f2e4339 Added Code of Conduct 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 18:34:23 +01:00
Jeroen van Baarsen ba4fe47606 Merge pull request #8374 from bbodenmiller/7-5-update-fix 
remove extra upgrade details, add missing config
 2014-12-14 18:31:37 +01:00
Ryunosuke SATO d11e048d7f Add missing webhook doc for tag event 2014-12-14 23:47:13 +09:00
Jeroen van Baarsen ed7b3f84ae Merge pull request #8429 from zertrin/fix-typo-in-docker-readme-1 
Fix typo in the README.md for docker
 2014-12-14 14:49:48 +01:00
Jeroen van Baarsen 3615b4de24 Merge pull request #8359 from bbodenmiller/patch-1 
add details on backing up your SSH host keys
 2014-12-13 17:24:56 +01:00
Dmitriy Zaporozhets 2497273030 Update CHANGELOG with snippet validation change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 16:35:05 +02:00
Dmitriy Zaporozhets ff65e55694 Merge branch 'sanitize-snippet-file-name' into 'master' 
Validate and sanitize snippet file name

Fixes #1816

See merge request !1322
 2014-12-12 14:31:51 +00:00
Dmitriy Zaporozhets bfebab1c10 Fix snippet factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 15:55:06 +02:00
Dmitriy Zaporozhets 118bd7178b Sanitize snippet file name in raw headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:28:48 +02:00
Dmitriy Zaporozhets f28a12a559 Add strict validation to snippet file names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:15:42 +02:00
Jacob Vosmaer b205db6300 Merge branch 'fix_shell_commands_in_shell_install' into 'master' 
Fix shell commands in shell install

Fixes #1610

See merge request !1320
 2014-12-12 11:08:52 +00:00
Marin Jankovski e5951cf4ae Don't forget to splat. 2014-12-12 10:42:55 +01:00
Marin Jankovski bd43cf0653 Use system where only return result is needed. 2014-12-12 10:17:07 +01:00
Dmitriy Zaporozhets 9a3ae331ad Merge branch 'dropdown_icon_not_clickable' into 'master' 
Dropdown icon not clickable

Fixes #1642 by using `pointer-events` property supported by [modern browsers](http://caniuse.com/#search=pointer-events)

See merge request !1319
 2014-12-11 15:02:01 +00:00
Dmitriy Zaporozhets 65b858a776 Merge branch 'show_files_with_diff_name' into 'master' 
Show files named diff

Fixes #1749

See merge request !1318
 2014-12-11 14:07:12 +00:00
Sytse Sijbrandij feb7c2bcce Merge branch 'contributing-md-file-read' into 'master' 
Add an extra reference to the 'shell commands' guide

The 'shell commands' guide now also has tips on opening/reading files and handling paths.

See merge request !1321
 2014-12-11 12:44:36 +00:00
Jacob Vosmaer 0ff2c67d4b The 'shell commands' guide also covers files/paths 2014-12-11 13:35:10 +01:00
Marin Jankovski cd4c65c159 Use shell invocation according to the shell commands guidelines. 2014-12-11 13:17:43 +01:00
Dmitriy Zaporozhets 9c9dc64a40 Update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-11 13:26:34 +02:00
Dmitriy Zaporozhets 0f07c18a9f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-12-11 13:26:11 +02:00
Dmitriy Zaporozhets fabcbda022 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-11 13:25:54 +02:00
Dmitriy Zaporozhets cf3d581004 Merge pull request #8052 from mr-vinn/markdown-preview 
Enable Markdown preview for issues, merge requests, milestones, and notes
 2014-12-11 13:23:33 +02:00
Marin Jankovski eceda17f09 Markdown dropzone image icon should not be clickable. 2014-12-10 17:24:11 +01:00
Marin Jankovski 1d0dfd50cc Do not check for format on blob diff path. 2014-12-10 15:54:01 +01:00
Marin Jankovski 22368fb8e8 Add a failing route spec for file named diff. 2014-12-10 15:52:56 +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
Drew Blessing d3a363729f Merge branch 'master' into 'master' 
Updated doc/integration/twitter.md, fixed incorrect callback URL

Fixed a typo in the Integration instructions for Twitter OAuth

See merge request !257
 2014-12-08 23:14:10 +00:00
Scott Stamp 8b6a2829ce Example callback URL was incorrect 
(referencing /users/auth/github/callback,
 not /users/auth/twitter/callback)
 2014-12-08 23:04:34 +00: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
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07: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