Software Publico / Gitlab

15 May, 2014

5 commits

216704f3 Merge branch 'mobile-ui-improvements' into 'master' ... Browse Code »

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 +0000

3127bd8a Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-05-15 19:55:32 +0300
a3a512f2 Hide group dashboard and project sidebar for xs size ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-15 16:30:50 +0300
0505a882 Hide control elements and last login for xs display ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-15 16:30:21 +0300
961810a4 Merge branch 'ad_disabled_users' into 'master' ... Browse Code »
```
Block 'disabled' AD users over SSH

The existing SSH access check for LDAP users ignored the ActiveDirectory 'disabled' flag.
```
Dmitriy Zaporozhets
2014-05-15 05:58:52 +0000

14 May, 2014

20 commits

be1120e9 Improve ad_disabled method name Browse Code »

Jacob Vosmaer
2014-05-14 19:13:06 +0200
a966f722 Document the Active Directory magic numbers Browse Code »

Jacob Vosmaer
2014-05-14 19:08:42 +0200
797e8072 Use LDAP::Access.open to reuse the LDAP connection Browse Code »

Jacob Vosmaer
2014-05-14 19:04:00 +0200
11dba4ce Fix syntax error in AD disabled user filter Browse Code »

Jacob Vosmaer
2014-05-14 18:54:05 +0200
a6e41538 Check for the AD disabled flag in Access#allowed? Browse Code »

Jacob Vosmaer
2014-05-14 18:32:40 +0200

a754f0b2 Add LDAP::Person#ad_disabled? ... Browse Code »

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 +0200

d54133b0 Add spec for LDAP::Access#allowed? Browse Code »

Jacob Vosmaer
2014-05-14 18:26:49 +0200
982d4d51 Backport Adapter#dn_matches_filter? from EE Browse Code »

Jacob Vosmaer
2014-05-14 18:11:14 +0200
f4bca105 Backport Adapter#ldap_search from EE Browse Code »

Jacob Vosmaer
2014-05-14 18:10:43 +0200
48008bfa Merge pull request #6972 from Dugucloud/master ... Browse Code »
```
Correct a wrong spelling
```
Sytse Sijbrandij
2014-05-14 16:40:43 +0200
2f8fd80e Correct a wrong spelling ... Browse Code »
```
"abolute" -> "absolute"
```
秋纫
2014-05-14 22:06:52 +0800
a107776e Merge branch 'update_grit_version' into 'master' ... Browse Code »
```
Update grit version
```
Marin Jankovski
2014-05-14 14:05:50 +0000
da8ebbb0 Merge branch 'pullreview' into 'master' ... Browse Code »
```
Pullreview
```
Sytse Sijbrandij
2014-05-14 13:13:25 +0000
c4c2655c Bump grit version. Browse Code »

Marin Jankovski
2014-05-14 15:02:42 +0200
fda0dff6 Add pullreview badge. Browse Code »

dosire
2014-05-14 14:49:14 +0200
0e8d2557 Merge branch 'endpoint_example' into 'master' ... Browse Code »
```
Add an example webhook receiver
```
Sytse Sijbrandij
2014-05-14 12:09:06 +0000
ad7de951 Add an example webhook receiver Browse Code »

Jacob Vosmaer
2014-05-14 13:49:16 +0200
f18f8e67 Merge pull request #6970 from skv-headless/fix_ctrl_enter_notes_send ... Browse Code »
```
fix ctrl+enter note send
```
Dmitriy Zaporozhets
2014-05-14 12:30:37 +0300
24b68fda fix ctrl+enter note send ... Browse Code »
```
use argument e instead of event
```
Evgeniy Sokovikov
2014-05-14 13:13:05 +0400
582646ff Merge branch 'gzip_assets_warning' into 'master' ... Browse Code »
```
Gzip assets warning for relative urls
```
Sytse Sijbrandij
2014-05-14 08:53:38 +0000

13 May, 2014

15 commits

c91300e4 Remove text-shadow from header ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-13 19:55:03 +0300

bc7cce92 Merge branch 'green-theme' into 'master' ... Browse Code »

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 +0000

636ec6d3 Update warnings about relative url support. Browse Code »

Marin Jankovski
2014-05-13 17:59:08 +0200
d5788921 Green theme instead of dark ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-13 18:41:36 +0300
d41fba4d Add warning to gitlab.yml related to gzip assets and relative links. Browse Code »

Marin Jankovski
2014-05-13 17:08:59 +0200
69577b57 Merge branch 'improve-jira-linking' into 'master' ... Browse Code »
```
Improve jira linking

Ported from EE
```
Marin Jankovski
2014-05-13 15:00:10 +0000
b787540f Change diff header bg ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-13 16:40:08 +0300
caa876af Improve file title ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-13 16:01:13 +0300
bb896613 Better name for config variable. Browse Code »

Marin Jankovski
2014-05-13 15:34:00 +0300
6b04a5f9 Add support for Jira ticket mentions in format JIRA-123. ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
```
Marin Jankovski
2014-05-13 15:33:38 +0300
5ddba39e Merge branch 'improve-violet-theme' into 'master' ... Browse Code »
```
Improve violet theme
```
Dmitriy Zaporozhets
2014-05-13 12:21:28 +0000
51280fc7 Improve violet theme ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-13 15:15:46 +0300
1f1c59b6 Merge pull request #6778 from dblessing/feature/mr_labels ... Browse Code »
```
Merge Request Labels
```
Dmitriy Zaporozhets
2014-05-13 14:43:46 +0300
5f25cdfe Implement Merge Request Labels Browse Code »

Drew Blessing
2014-05-13 06:41:36 -0500

0c621708 Merge branch 'api-mr-merge' into 'master' ... Browse Code »

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 +0000