Software Publico / Gitlab

13 May, 2014

24 commits

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

2d2b2da4 More tests for merge api ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-13 13:20:10 +0300
17858d49 Merge pull request #6109 from jamit/master ... Browse Code »
```
Added email threading for update emails on issues and merge requests
```
Dmitriy Zaporozhets
2014-05-13 12:35:33 +0300
3ea4bf48 Merge pull request #6045 from jacargentina/fix-4305 ... Browse Code »
```
Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
```
Dmitriy Zaporozhets
2014-05-13 12:29:54 +0300
0401e195 Merge pull request #6385 from cirosantilli/72-char-commit-msg ... Browse Code »
```
Commit message textareas have 72 char mark line.
```
Dmitriy Zaporozhets
2014-05-13 12:29:28 +0300
0fd12a78 Merge pull request #6825 from sue445/feature/post_automerge ... Browse Code »
```
Fix can not automerge when description is too long
```
Dmitriy Zaporozhets
2014-05-13 12:26:42 +0300
e0fdb426 Merge pull request #6823 from milgner/api_expose_project_archived_status ... Browse Code »
```
Expose archive status of projects in API
```
Dmitriy Zaporozhets
2014-05-13 12:24:44 +0300
6d65afb3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-05-13 11:38:18 +0300
8b05490f Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-05-13 11:38:07 +0300
1a57a1e4 Merge branch 'use_ldap_uid_as_username_instead_of_first_part_of_email_address_on… ... Browse Code »
```
…_user_creation' into 'master'

Use ldap uid as username instead of first part of email address on user creation
```
Dmitriy Zaporozhets
2014-05-13 08:32:10 +0000
5c69022c Merge pull request #6959 from dtan4/fix-dead-links ... Browse Code »
```
Fix dead links in ruby.md
```
Dmitriy Zaporozhets
2014-05-13 11:14:56 +0300
ab032256 Add some tests for merge API ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-13 11:01:40 +0300
d85cc4c7 Merge branch 'api-wrapper' into 'master' ... Browse Code »
```
Api wrapper
```
Dmitriy Zaporozhets
2014-05-13 07:18:16 +0000
f0e46ec9 Let people know that Nihad Abbasov made a nice api wrapper. Browse Code »

dosire
2014-05-13 07:58:12 +0200

12 May, 2014

13 commits

5880d7df Docs for merge api ... Browse Code »
```
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 Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-12 17:51:43 +0300
78897ee2 Fix dead links in ruby.md Browse Code »

dtan4
2014-05-12 22:49:32 +0900
fe6d3922 Draft API method for merge MR ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-12 16:34:41 +0300
68b89142 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-05-12 15:30:07 +0300
d88b022e Merge branch 'changelog-satellite' into 'master' ... Browse Code »
```
Changelog satellite
```
Dmitriy Zaporozhets
2014-05-12 12:29:36 +0000
2efcd301 Add changelog entry for satellite clean. Browse Code »

dosire
2014-05-12 13:57:20 +0200
b6ca6623 Merge branch 'monthly-revision' into 'master' ... Browse Code »
```
Monthly release doc revision

/cc @sytse @jacobvosmaer @marin @dzaporozhets @marc
```
Sytse Sijbrandij
2014-05-12 11:16:32 +0000
7ec9777a Merge branch 'master' into 'master' ... Browse Code »
```
Fix typo in doc/install/requirements.md
```
Jacob Vosmaer
2014-05-12 10:19:56 +0000
8b9b34f8 Mention 2 step MR in CHANGELOG ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-12 13:06:25 +0300

a54408b9 Merge branch 'expose_visibility_in_project_create_service_hook' into 'master' ... Browse Code »

Expose project visibility in system service hooks

Our gitlab installation is currently setup with a system hook to ping our hubot. Currently whenever a project is created, hubot announces this, regardless of project visibility. It didn't really make sense for everyone to see this, and as the project visibility wasn't exposed in the JSON hook output, I thought I'd add it in!

As far as I'm aware, tests still run and pass OK. I'm not exactly rails savvy though, so any pointers/fixes/etc, please let me know!

2014-05-12 09:45:17 +0000

31b0e149 Adding project visibility to system hooks Browse Code »

Alex
2014-05-12 10:23:24 +0100

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

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

11 May, 2014

3 commits

c355b9ab Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict ... Browse Code »
```
Fix css rules conflict between .dark & a.dark classes
```
Dmitriy Zaporozhets
2014-05-11 20:36:16 +0300
a3d8be09 Fix can not automerge if description is too long Browse Code »

sue445
2014-05-11 23:50:14 +0900
7477dd7a Fix typo Browse Code »

Pascal Herbert
2014-05-11 13:23:51 +0000