Software Publico / Gitlab

27 May, 2014

15 commits

c862bc6f Merge branch 'ldap_user_filter_fix' into 'master' ... Browse Code »
```
LDAP user filter fix
```
Dmitriy Zaporozhets
2014-05-27 15:32:41 +0000
cb4b504b Merge branch 'merge-patch-changelog-back-into-master' into 'master' ... Browse Code »
```
Merge patch changelog back into master

/cc @dzaporozhets
```
Marin Jankovski
2014-05-27 14:39:38 +0000

7dfb678d Revert "Actually use the 'user_filter' configuration option" ... Browse Code »

This reverts commit e9d4587ff11c8510f01dfa184414f73d75b4550b, which is
incompatible with GitLab's built in LDAP user filter: a GitLab LDAP
filter is [added on top of the other filters used to find the
user](https://gitlab.com/gitlab-org/gitlab-ce/blob/982d4d51e8110bec280eb00db0fb756b062103d9/lib/gitlab/ldap/adapter.rb#L61)

Example GitLab LDAP filter: `(memberOf=cn=foo,dc=bar)`.

In contrast, an omniauth-ldap filter [replaces the 'normal'
filters](https://gitlab.com/gitlab-org/omniauth-ldap/blob/76d77543dec0c585bb4e974262f43675f9810953/lib/omniauth/strategies/ldap.rb#L55)

Example omniauth-ldap user filter:
`(&(uid=%{username})(memberOf=cn=foo,dc=bar))`.

2014-05-27 15:53:04 +0200

c8b58f00 Cherry-pick the changelog additions into master. Browse Code »

dosire
2014-05-27 14:56:52 +0200
3bdf0e29 Merge branch 'compare-api' into 'master' ... Browse Code »
```
Compare api

Fixes #1165
```
Dmitriy Zaporozhets
2014-05-27 11:16:07 +0000
3553e36d Merge branch 'review-changelog' into 'master' ... Browse Code »
```
Review changelog

@dzaporozhets updates the changelog and notifies the team.
```
Marin Jankovski
2014-05-27 10:35:35 +0000

b60226ab Merge branch 'improve-mr-tabs' into 'master' ... Browse Code »

Improve merge request page UX

Increase Discussions and Changes tabs size. Added count of changes and comment to it

Before and after:

![Screenshot 2014-05-27 12.08.42](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/31fe70c9be/Screenshot_2014-05-27_12.08.42.png)

2014-05-27 10:08:34 +0000

d7b3bbfc Make MR dicussion and changes tabs more noticable ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-27 12:06:31 +0300
c7e00aca Better specs for Compare API ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-27 11:27:42 +0300
10ee137e Expose timeout and same_ref compare fields ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-27 11:16:50 +0300
f4889f50 Add entry to changelog. Browse Code »

Marin Jankovski
2014-05-27 08:58:26 +0200
e918ae24 Merge branch 'no_link_inside_code_block' into 'master' ... Browse Code »
```
No link inside code block
```
Dmitriy Zaporozhets
2014-05-27 06:26:22 +0000
7c5d96cf Merge branch 'improve-gitlab-test' into 'master' ... Browse Code »
```
Improve rake test

Check for `system` call return value instead of `$?.exitstatus`
```
Dmitriy Zaporozhets
2014-05-27 06:00:38 +0000
aef2122f Merge branch 'css-truncation' into 'master' ... Browse Code »
```
CSS truncation

Use css truncation for event titles on dashboard. Fix vertical align of timestamps
```
Dmitriy Zaporozhets
2014-05-27 05:13:06 +0000
1e7fa8d9 Fix syntax error ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-27 08:12:03 +0300

26 May, 2014

25 commits

c9020ae5 Fix test.rake Browse Code »

Dmitriy Zaporozhets
2014-05-26 20:30:45 +0000
c4562316 Use css truncation on dashboard Browse Code »

Dmitriy Zaporozhets
2014-05-26 23:26:41 +0300
e426d439 Check return system value for gitlab test rake tasks ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-26 21:54:57 +0300
281643a1 Add feature spec. Browse Code »

Marin Jankovski
2014-05-26 20:43:58 +0200
603e04bc Make sure slashes are handled properly. Browse Code »

Marin Jankovski
2014-05-26 20:43:58 +0200
52c3179b Do not replace links inside code blocks, less code for the same amount of work. Browse Code »

Marin Jankovski
2014-05-26 20:43:58 +0200
7ad5fb53 Merge branch 'push-release-doc' into 'master' ... Browse Code »
```
Push release doc
```
Dmitriy Zaporozhets
2014-05-26 18:43:51 +0000
f4865881 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-05-26 21:38:41 +0300
21649cab Merge branch 'fix/drag_and_drop_image_tests' into 'master' ... Browse Code »
```
Fix drag and drop image tests
```
Dmitriy Zaporozhets
2014-05-26 18:38:05 +0000

e03a2fa2 Merge branch 'email-hint' into 'master' ... Browse Code »

Email hint

After this is merged decline http://feedback.gitlab.com/forums/176466-general/suggestions/5767472-move-actionmailer-sending-method-and-smpt-settings

2014-05-26 18:35:49 +0000

c267d183 Merge branch 'test-ee' into 'master' ... Browse Code »
```
Test ee
```
Dmitriy Zaporozhets
2014-05-26 18:35:13 +0000
b2ec09e5 Specify what version to test manually. Browse Code »

dosire
2014-05-26 17:09:31 +0200
24229185 Add some tests to compare api ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-26 18:05:55 +0300
040b3be5 Give a hint where to find the email settings. Browse Code »

dosire
2014-05-26 16:15:12 +0200
9b2a1349 Need txt file in test. Browse Code »

Marin Jankovski
2014-05-26 15:58:03 +0200
43e7b8fa Remove empty space Browse Code »

Marin Jankovski
2014-05-26 15:55:41 +0200
fe10f371 Add default arguments, name gitlab repo gl, suggest dotfile repo. Browse Code »

dosire
2014-05-26 15:54:06 +0200
f8a6d340 Add image_service spec. Browse Code »

Marin Jankovski
2014-05-26 15:47:54 +0200
c7a55309 Small layout improvements. Browse Code »

dosire
2014-05-26 15:40:44 +0200
75e90cb4 Push to all remotes doc. Browse Code »

dosire
2014-05-26 15:38:18 +0200
f441436e Add compare branches endpoint to API ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-26 16:08:22 +0300
3b2b3cff Move logic to image_service. Browse Code »

Marin Jankovski
2014-05-26 14:54:03 +0200

13233d6d Merge branch 'regression-issue' into 'master' ... Browse Code »

Regression issue

We want to aid communication between the issue tracker team and the release manager with this.

A first example of this issue is https://gitlab.com/gitlab-org/gitlab-ce/issues/294

2014-05-26 12:18:37 +0000

8bec6b0b Make existing tests test something, return correct errors. Browse Code »

Marin Jankovski
2014-05-26 14:17:46 +0200

d4b61a67 Merge branch 'add_pkgrio_to_readme' into 'master' ... Browse Code »

Add pkgrio to readme

Now that we have instructions on [pkgr.io](https://gitlab.com/gitlab-org/gitlab-recipes/blob/master/install/pkgr/README.md) let's add it to the Readme.

2014-05-26 08:42:17 +0000