Software Publico / Gitlab

28 May, 2014

13 commits

260c877c Merge branch 'render_org_files' into 'master' ... Browse Code »
```
Render org files

Fixes #1215
```
Dmitriy Zaporozhets
2014-05-28 14:09:39 +0000
10fad7b0 Merge branch 'link-to-installation-options' into 'master' ... Browse Code »
```
Link to installation options
```
Dmitriy Zaporozhets
2014-05-28 14:08:59 +0000
5580dc99 Merge branch 'backport-ci-service' into 'master' ... Browse Code »
```
Backport CI service refactoring from EE

It allows easier contribution of different CI services.
Fixes #1280
```
Dmitriy Zaporozhets
2014-05-28 14:05:00 +0000
59f68b1b Link to installation page. Browse Code »

dosire
2014-05-28 15:26:25 +0200
666260bf Add changelog for version to 6.9.1. ... Browse Code »
```
Conflicts:
	CHANGELOG
	VERSION
```
Marin Jankovski
2014-05-28 13:04:57 +0200
c183019c Merge branch 'use_newer_git_version' into 'master' ... Browse Code »
```
Use newer git version

Fixes #1272
```
Sytse Sijbrandij
2014-05-28 11:01:55 +0000
82855e07 Keep the lowest requirement for git in the documentation. Browse Code »

Marin Jankovski
2014-05-28 12:53:10 +0200
dc158af6 Add org-ruby for rendering .org files. Browse Code »

Marin Jankovski
2014-05-28 12:23:03 +0200
a3db7631 Fix haml indent ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-28 12:52:02 +0300
8a3807c8 Fix tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-28 12:40:22 +0300
a18ae13e Backport CI service refactoring from EE ... Browse Code »
```
It allows easier contribution of different CI services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-28 11:35:43 +0300
49c50ee8 Merge branch 'gitlab-shell-upgrade-might-be-required' into 'master' ... Browse Code »
```
Gitlab shell upgrade might be required

Also got rid of `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production` since gitlab:check is more important.
```
Dmitriy Zaporozhets
2014-05-28 07:37:46 +0000
ca907e4f Make it more obvious that GitLab Shell should be upgraded. Browse Code »

dosire
2014-05-28 09:28:39 +0200

27 May, 2014

25 commits

6bd114a7 Merge branch 'remove-branch-btn' into 'master' ... Browse Code »
```
Don't show remove branch button if you are not allowed to remove it

Fixes #1213
```
Dmitriy Zaporozhets
2014-05-27 18:49:18 +0000
3682e726 Merge branch 'move_script_to_bin' into 'master' ... Browse Code »
```
Move script to bin

Fixes #925
```
Dmitriy Zaporozhets
2014-05-27 17:03:34 +0000
affd376f Dont show remove source branch ckecbox/button if you dont have such ... Browse Code »
```
permissions for MR page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-27 18:51:41 +0300
d25bc257 Merge branch 'gitlab_shell_in_upgrader_guide' into 'master' ... Browse Code »
```
Gitlab shell in upgrader guide

Fixes #1214
```
Dmitriy Zaporozhets
2014-05-27 15:34:47 +0000
19ea3622 Merge branch 'add_titles_to_help_pages' into 'master' ... Browse Code »
```
Add titles to help pages

Fixes #1183
```
Dmitriy Zaporozhets
2014-05-27 15:33:15 +0000
c862bc6f Merge branch 'ldap_user_filter_fix' into 'master' ... Browse Code »
```
LDAP user filter fix
```
Dmitriy Zaporozhets
2014-05-27 15:32:41 +0000
2341cefd Move from script to bin directory. Browse Code »

Marin Jankovski
2014-05-27 17:14:41 +0200
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
cee88509 Fix typo in text. Browse Code »

Marin Jankovski
2014-05-27 16:30:39 +0200

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
046647a7 Add directions on how to upgrade gitlab-shell in the upgrader guide. Browse Code »

Marin Jankovski
2014-05-27 14:25:34 +0200
f22c7095 Add titles to doc pages. Browse Code »

Marin Jankovski
2014-05-27 14:12:15 +0200
3bdf0e29 Merge branch 'compare-api' into 'master' ... Browse Code »
```
Compare api

Fixes #1165
```
Dmitriy Zaporozhets
2014-05-27 11:16:07 +0000
e1013699 Use newer version of git in installation doc. Browse Code »

Marin Jankovski
2014-05-27 13:06:20 +0200
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

2 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