home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,038 Commits 48 Branches 340 Tags
c19248a2850f8c75a2ce87883f4dee3145edfb4e
Commit Graph
14038 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski c19248a285 Add group membership lock field to namespaces. 2014-12-12 13:52:36 +01:00
Dmitriy Zaporozhets 29c0cf9186 Update EE changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 14:30:33 +02:00
Dmitriy Zaporozhets 177c89b8b8 Merge branch 'ce-changes' into 'master' 
CE changes from upstream

See merge request !266
 2014-12-12 12:25:36 +00:00
Dmitriy Zaporozhets 8eb29cd5d6 Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:32:15 +02:00
Marin Jankovski d991e0b2e9 Merge branch 'fix/project_show_also_ldap_users' into 'master' 
Fix/project show also ldap users

In 336b7b8 a feature was (silently) added which broke our use case of using LDAP synced groups as a common base for user <-> project mapping 😒

Although
>v 7.4.0
>  - [...]
>  - Do not show ldap users in dropdowns for groups with enabled ldap-sync
>  - [...]

indicates that the drop down boxes for groups have changed, it does not for projects in such a group. To be clear: It totally makes sense to not manually manage users for LDAP synced groups, on a project basis however it is very useful and an essential feature to allow self-service in organizations.

Please consider making the `skip_ldap` flag optional for the dropdown boxes.
[Also, make sure that the provider you're excluding actually is called `ldap`, which might not be the case for installations with multiple LDAP backends.](https://gitlab.com/subscribers/gitlab-ee/blob/master/lib/api/users.rb#L16)

This MR is a quick fix to disable this feature for projects.

See merge request !25
 2014-12-12 08:12:52 +00:00
Marin Jankovski 49cc6f5822 Merge branch 'syntaxdoc' into 'master' 
Fix syntax in documentation of ldap config

See merge request !265
 2014-12-12 08:08:44 +00:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Dmitriy Zaporozhets 9eb72609e7 Merge branch 'improve-ldap' into 'master' 
Hide ldap group links if ldap is not enabled

This MR also includes a fix for next issue: prevent 500 error on ldap group links page if group has links to ldap servers that are disabled or removed from gitlab config.

Fixes #196

See merge request !264
 2014-12-11 16:05:14 +00:00
Dmitriy Zaporozhets 5fd2e01d67 Disable ldap after test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-11 17:24:10 +02: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
Job van der Voort 030a71b780 use new syntax in ldap doc 2014-12-11 15:15:33 +01: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
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 9d0c59653c Fix ldap group sync test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-08 19:49:30 +02: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
Dmitriy Zaporozhets 633fb8ab6b Prevent 500 error on ldap group links page 
If group has links to ldap servers that are disabled or removed from
gitlab config.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-08 15:58:01 +02: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
Dmitriy Zaporozhets f5d3e47e39 Hide ldap group links if ldap is not enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-08 15:45:55 +02: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
Dmitriy Zaporozhets 230900b981 Merge branch 'upstream-ce' into 'master' 
Upstream changes from CE

See merge request !262
 2014-12-08 12:41:38 +00: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
Valery Sizov 2f006f89a5 fix specs after merge CE -> EE 2014-12-08 13:11:33 +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
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