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
9,716 Commits 48 Branches 340 Tags
41ca07e6cb384a38dc629738ee4a7bf422e4e13a
Commit Graph
9716 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
NotSqrt 41ca07e6cb merge into current master 2014-05-15 19:25:29 +02:00
Dmitriy Zaporozhets cb58e1cbd7 Merge branch 'ad_disabled_changelog' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-05-15 19:58:39 +03:00
Dmitriy Zaporozhets 39eac7b0b9 Merge branch 'api_ldap' into 'master' 
Check user access during API calls
 2014-05-15 16:57:05 +00:00
Dmitriy Zaporozhets 216704f31a Merge branch 'mobile-ui-improvements' into 'master' 
Mobile ui improvements

* Fixes blob view - https://twitter.com/jamesgecko/status/466675058664951808
* Hide project sidebar for xs
* Hide group activity for xs
 2014-05-15 16:55:58 +00:00
Dmitriy Zaporozhets 3127bd8a43 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-15 19:55:32 +03:00
Dmitriy Zaporozhets a3a512f2ef Hide group dashboard and project sidebar for xs size 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 16:30:50 +03:00
Dmitriy Zaporozhets 0505a88299 Hide control elements and last login for xs display 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 16:30:21 +03:00
Jacob Vosmaer 223a8695be Add API access checks to CHANGELOG 2014-05-15 10:32:20 +02:00
Jacob Vosmaer 2d8c310f11 Make user access test pass for the right reason 
If we do not set a private token during the test, current_user will be
nil because the user is not found, not due to the access check.
 2014-05-15 10:30:50 +02:00
Jacob Vosmaer 02b85fd236 Check user access status in API for current_user 2014-05-15 10:22:59 +02:00
Jacob Vosmaer 34fd557055 Move user access check to Gitlab::UserAccess 2014-05-15 10:22:59 +02:00
Jacob Vosmaer 6d45909f03 Add test for current behavior of current_user 2014-05-15 09:57:21 +02:00
Jacob Vosmaer b024c094d3 Add CHANGELOG entry for the AD disabled flag 2014-05-15 08:10:19 +02:00
Dmitriy Zaporozhets 961810a442 Merge branch 'ad_disabled_users' into 'master' 
Block 'disabled' AD users over SSH

The existing SSH access check for LDAP users ignored the ActiveDirectory 'disabled' flag.
 2014-05-15 05:58:52 +00:00
Jacob Vosmaer be1120e968 Improve ad_disabled method name 2014-05-14 19:13:06 +02:00
Jacob Vosmaer a966f72224 Document the Active Directory magic numbers 2014-05-14 19:08:42 +02:00
Jacob Vosmaer 797e807249 Use LDAP::Access.open to reuse the LDAP connection 2014-05-14 19:04:00 +02:00
Jacob Vosmaer 11dba4cee7 Fix syntax error in AD disabled user filter 2014-05-14 18:54:05 +02:00
Jacob Vosmaer a6e4153878 Check for the AD disabled flag in Access#allowed? 2014-05-14 18:32:40 +02:00
Jacob Vosmaer a754f0b220 Add LDAP::Person#ad_disabled? 
Check the bit for disabled Active Directory users. The filter is based
on http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/ .
 2014-05-14 18:26:58 +02:00
Jacob Vosmaer d54133b09f Add spec for LDAP::Access#allowed? 2014-05-14 18:26:49 +02:00
Jacob Vosmaer 982d4d51e8 Backport Adapter#dn_matches_filter? from EE 2014-05-14 18:11:14 +02:00
Jacob Vosmaer f4bca105d1 Backport Adapter#ldap_search from EE 2014-05-14 18:10:43 +02:00
Sytse Sijbrandij 48008bfa42 Merge pull request #6972 from Dugucloud/master 
Correct a wrong spelling
 2014-05-14 16:40:43 +02:00
秋纫 2f8fd80ebb Correct a wrong spelling 
"abolute" -> "absolute"
 2014-05-14 22:06:52 +08:00
Marin Jankovski a107776ef8 Merge branch 'update_grit_version' into 'master' 
Update grit version
 2014-05-14 14:05:50 +00:00
Sytse Sijbrandij da8ebbb09f Merge branch 'pullreview' into 'master' 
Pullreview
 2014-05-14 13:13:25 +00:00
Marin Jankovski c4c2655c01 Bump grit version. 2014-05-14 15:02:42 +02:00
dosire fda0dff6d3 Add pullreview badge. 2014-05-14 14:49:14 +02:00
Sytse Sijbrandij 0e8d2557d8 Merge branch 'endpoint_example' into 'master' 
Add an example webhook receiver
 2014-05-14 12:09:06 +00:00
Jacob Vosmaer ad7de95121 Add an example webhook receiver 2014-05-14 13:49:16 +02:00
Dmitriy Zaporozhets f18f8e6755 Merge pull request #6970 from skv-headless/fix_ctrl_enter_notes_send 
fix ctrl+enter note send
 2014-05-14 12:30:37 +03:00
Evgeniy Sokovikov 24b68fdada fix ctrl+enter note send 
use argument e instead of event
 2014-05-14 13:13:05 +04:00
Sytse Sijbrandij 582646ff95 Merge branch 'gzip_assets_warning' into 'master' 
Gzip assets warning for relative urls
 2014-05-14 08:53:38 +00:00
Dmitriy Zaporozhets c91300e4ce Remove text-shadow from header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 19:55:03 +03:00
Dmitriy Zaporozhets bc7cce9251 Merge branch 'green-theme' into 'master' 
Green theme

Because we have 3 dark themes with similar colours. So it makes sense to replace one with something colourful. So why not green? :)
 2014-05-13 16:47:56 +00:00
Marin Jankovski 636ec6d3a0 Update warnings about relative url support. 2014-05-13 17:59:08 +02:00
Dmitriy Zaporozhets d57889212b Green theme instead of dark 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 18:41:36 +03:00
Marin Jankovski d41fba4d37 Add warning to gitlab.yml related to gzip assets and relative links. 2014-05-13 17:08:59 +02:00
Marin Jankovski 69577b57f8 Merge branch 'improve-jira-linking' into 'master' 
Improve jira linking

Ported from EE
 2014-05-13 15:00:10 +00:00
Dmitriy Zaporozhets b787540f71 Change diff header bg 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 16:40:08 +03:00
Dmitriy Zaporozhets caa876af90 Improve file title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 16:01:13 +03:00
Marin JankovskiandDmitriy Zaporozhets bb89661365 Better name for config variable. 2014-05-13 15:34:00 +03:00
Marin JankovskiandDmitriy Zaporozhets 6b04a5f910 Add support for Jira ticket mentions in format JIRA-123. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
 2014-05-13 15:33:38 +03:00
Dmitriy Zaporozhets 5ddba39eef Merge branch 'improve-violet-theme' into 'master' 
Improve violet theme
 2014-05-13 12:21:28 +00:00
Dmitriy Zaporozhets 51280fc76c Improve violet theme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 15:15:46 +03:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Dmitriy Zaporozhets 0c62170865 Merge branch 'api-mr-merge' into 'master' 
Accept merge request API

This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API.

Fixes internal issue #1166
 2014-05-13 11:27:19 +00:00
Dmitriy Zaporozhets 2d2b2da45a More tests for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 13:20:10 +03:00