Software Publico / Gitlab

23 May, 2014

1 commit

9e6466c7 Merge branch 'api-remove-branch' into 'master' ... Browse Dir »

New rules for protected branches

This MR change permissions logic for branch removal. Changes listed below:

Before
* developer can remove branch with terminal but not in UI
* masters can remove any branch with UI even protected one
* force-push to protected branch is not allowed but remove is allowed

After
* none can force push or remove protected branches
* developers and masters can remove normal branches with console and UI

2014-05-23 06:06:22 +0000

22 May, 2014

3 commits

36cac35b Dont allow remove of protected branch ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 15:38:47 +0300
a9d60b3b Api call to remove branch ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 14:39:50 +0300
b019c061 Required shell version is now 1.9.4. Browse Dir »

Marin Jankovski
2014-05-22 11:01:01 +0200

15 May, 2014

2 commits

02b85fd2 Check user access status in API for current_user Browse Dir »

Jacob Vosmaer
2014-05-15 10:22:59 +0200
34fd5570 Move user access check to Gitlab::UserAccess Browse Dir »

Jacob Vosmaer
2014-05-15 10:22:59 +0200

14 May, 2014

8 commits

be1120e9 Improve ad_disabled method name Browse Dir »

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

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

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

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

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

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

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

982d4d51 Backport Adapter#dn_matches_filter? from EE Browse Dir »

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

Jacob Vosmaer
2014-05-14 18:10:43 +0200

13 May, 2014

7 commits

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

Marin Jankovski
2014-05-13 17:59:08 +0200
6b04a5f9 Add support for Jira ticket mentions in format JIRA-123. ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
```
Marin Jankovski
2014-05-13 15:33:38 +0300
1f1c59b6 Merge pull request #6778 from dblessing/feature/mr_labels ... Browse Dir »
```
Merge Request Labels
```
Dmitriy Zaporozhets
2014-05-13 14:43:46 +0300
5f25cdfe Implement Merge Request Labels Browse Dir »

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

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

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

e0fdb426 Merge pull request #6823 from milgner/api_expose_project_archived_status ... Browse Dir »
```
Expose archive status of projects in API
```
Dmitriy Zaporozhets
2014-05-13 12:24:44 +0300
ab032256 Add some tests for merge API ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-13 11:01:40 +0300

12 May, 2014

4 commits

5880d7df Docs for merge api ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-12 18:01:22 +0300
0c73e666 Specify error codes for merge api ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-12 17:51:43 +0300
fe6d3922 Draft API method for merge MR ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-12 16:34:41 +0300

566badba Use uid as username when creating user with LDAP ... Browse Dir »

Without that commit, each user created by a LDAP login would have the
first part of their email address as nickname.

This is not useful for LDAP, where a uid attribute is already set.

2014-05-12 07:30:35 +0200

08 May, 2014

6 commits

0f29ccff Backup wiki repo even if the main repo is empty ... Browse Dir »
```
This fixes a bug where wiki repositories for projects with an empty main
repository would not get backed up.
```
Jacob Vosmaer
2014-05-08 22:50:48 +0200
32875f9a Merge pull request #6937 from chamill/master ... Browse Dir »
```
Provide fallback for missing `name` value.
```
Dmitriy Zaporozhets
2014-05-08 21:49:59 +0300
cb20ab02 Merge pull request #6929 from asedge/fix_api_branches_with_periods ... Browse Dir »
```
Add fix for API when branch names have periods in them.  Relates to issu...
```
Dmitriy Zaporozhets
2014-05-08 21:22:13 +0300
da347d1b Apply the locale encoding to `tar --version` ... Browse Dir »
```
Fixes a bug with non-UTF8 locales introduced by
2b816075dc71dfe8f6f9e5349fdff7f03ad9dad0.
```
Jacob Vosmaer
2014-05-08 18:23:44 +0200
04561011 Clean up conditional statement in `name` method. ... Browse Dir »
```
Reverse the conditional order to avoid awkward `if !` construction.
```
C. Morgan Hamill
2014-05-08 09:23:17 -0400
da9b009d Add fix for API when branch names have periods in them. Relates to issue #6128 … ... Browse Dir »
```
…(https://github.com/gitlabhq/gitlabhq/issues/6128).
```
Sean Edge
2014-05-08 07:06:47 -0400

07 May, 2014

3 commits

a45f7262 Clean up of `name` fallback code. ... Browse Dir »
```
Don't use `unless` for the conditional.
Avoid double-quotes where possible.
```
C. Morgan Hamill
2014-05-07 16:41:35 -0400
9e805b77 Provide fallback for missing `name` value. ... Browse Dir »
```
If `auth.info.name` is `nil`, then use `auth.info.first_name + auth.info.last_name`
as the value of `name`.
```
C. Morgan Hamill
2014-05-07 16:33:54 -0400
4fea8afc Add CompareAction class for collecting commits and diffs using satellites ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-07 16:14:24 +0300

06 May, 2014

1 commit

fd7a221c Change gitlab:test task ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-06 09:07:15 +0300

05 May, 2014

1 commit

cac916d9 Clean working directory in satellite ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-05 14:21:00 +0300

02 May, 2014

3 commits

87c397f5 More fixes to gitlab:shell:install ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-02 14:13:45 +0300
dd47f953 Fix gitlab-shell setup rake task ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-02 13:46:32 +0300
85b5d203 Merge branch 'improve-gitlab-shell-installation' of https://github.com/pkgr/gitl… ... Browse Dir »
```
…abhq into pkgr-improve-gitlab-shell-installation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/install/installation.md
```
Dmitriy Zaporozhets
2014-05-02 13:30:26 +0300

29 Apr, 2014

1 commit

c51ac048 Merge pull request #5962 from skv-headless/editing-preview ... Browse Dir »
```
editing preview
```
Dmitriy Zaporozhets
2014-04-29 10:00:29 +0300