Software Publico / Gitlab

07 Apr, 2014

9 commits

6d196962 Fix faulty namespaces Browse Code »

Job van der Voort
2014-04-07 16:03:49 +0200
11d3a00c Merge branch 'add-github-app' into 'master' ... Browse Code »
```
Add github app
```
Dmitriy Zaporozhets
2014-04-07 12:12:42 +0000
a4523c52 Also add example for GitHub. Browse Code »

dosire
2014-04-07 14:11:00 +0200
0dc48fac Merge branch 'remove_reaping_frequency' into 'master' ... Browse Code »
```
Remove reaping frequency
```
Dmitriy Zaporozhets
2014-04-07 10:40:27 +0000
d8ed8990 Merge branch 'add-twitter' into 'master' ... Browse Code »
```
Add twitter documentation
```
Dmitriy Zaporozhets
2014-04-07 10:40:15 +0000

5163a8fc Disable connection reaping for MySQL ... Browse Code »

On GitLab Cloud, MySQL connection reaping seemed to cause more problems
(exceptions and segfaults in the native MySQL client) than it solved.

2014-04-07 12:32:24 +0200

ba72bd1d Add twitter documentation. Browse Code »

dosire
2014-04-07 11:53:48 +0200
ab7b8b21 Merge branch 'fix/rake_satellites_create' into 'master' ... Browse Code »
```
Fix popen bug in `rake gitlab:satellites:create`
```
Dmitriy Zaporozhets
2014-04-07 09:42:13 +0000

bcfd9386 Fix popen bug in `rake gitlab:satellites:create` ... Browse Code »

The Satellite#create method no longer sets the `$?` global variable.
Instead, we can use the method return value to test if the satellite was
created successfully

2014-04-07 11:22:27 +0200

06 Apr, 2014

12 commits

bfd44948 Merge branch 'show_diff' into 'master' ... Browse Code »
```
Show note diff if diff exists
```
Dmitriy Zaporozhets
2014-04-06 17:01:15 +0000
4e002a71 Merge branch 'improve-mr-widget' into 'master' ... Browse Code »
```
 Restyle merge request accept and ci widget

Fixes #1138
```
Dmitriy Zaporozhets
2014-04-06 14:57:51 +0000
8e7f80ee Restyle merge request accept and ci widget ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-06 17:10:37 +0300
bc40efa1 Merge pull request #6705 from razielgn/slack-service-attachments ... Browse Code »
```
Improved Slack integration with message attachments.
```
Dmitriy Zaporozhets
2014-04-06 14:27:02 +0300
3740597f Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-04-06 14:26:38 +0300
7ced2eb4 Use normal btn size for test service ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-06 14:26:24 +0300
26ab17a8 Merge pull request #5508 from jojosch/apidoc-json ... Browse Code »
```
Api-Doc and Web-Hooks JSON lint
```
Sytse Sijbrandij
2014-04-06 13:19:52 +0200
ae2089a9 Fix autocomplete css ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-06 14:10:48 +0300
84a8b29f Merge branch 'jacob-carlborg-remove_source_branch_button' Browse Code »

Dmitriy Zaporozhets
2014-04-06 13:55:18 +0300

1a17289b Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/… ... Browse Code »

…gitlabhq into jacob-carlborg-remove_source_branch_button

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

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb

2014-04-06 13:54:54 +0300

6a9eb4b2 Improved Slack integration with message attachments. Browse Code »

Federico Ravasio
2014-04-06 11:57:48 +0200
2ceef769 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-04-06 10:16:44 +0300

05 Apr, 2014

5 commits

7ae488ed Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-04-05 13:20:01 +0300
b01e7116 Merge pull request #6701 from idealhack/add-ios-icon ... Browse Code »
```
Add icon for iOS home screen
```
Dmitriy Zaporozhets
2014-04-05 13:17:21 +0300

2f945ac5 Merge branch 'request/relative_submodules' into 'master' ... Browse Code »

 Add support for relative submodules

Currently there is no support for submodules where the url starts with ./ or ../, it will fail with an Routing Error.
This is required is you don't want to force a submodule to ssh or http usage.

For a given Repository __http://server/group/root.git__

---

[submodule "sub1"]
	path = sub1
	url = ../submodule.git

Wrong: http://server/group/ __root__ /submodule.git
Correct: http://server/group/submodule.git

---

[submodule "sub2"]
	path = sub2
	url = ../../any/submodule.git

Wrong: http://server/ __group/any__ /submodule.git
Corrent: http://server/any/submodule.git

2014-04-05 10:00:07 +0000

49addad7 Api-Doc JSON lint ... Browse Code »
```
Fixes: #5505
```
Johannes Schleifenbaum
2014-04-05 08:37:42 +0200
8c7f4f2b Add icon for iOS home screen Browse Code »

Yang Li
2014-04-05 11:13:38 +0800

04 Apr, 2014

14 commits

4d194502 Merge branch 'master' into request/relative_submodules Browse Code »

Timm Drevensek
2014-04-04 23:50:39 +0200
17bb7007 Only show diff it exists. Browse Code »

Marin Jankovski
2014-04-04 19:12:23 +0200
3d2c8185 Merge branch 'deduplicate-help' into 'master' ... Browse Code »
```
Deduplicate help
```
Dmitriy Zaporozhets
2014-04-04 15:18:42 +0000
64341cca Merge branch 'gems-bump' into 'master' ... Browse Code »
```
Update gitlab_git and gitlab-grit gem versions
```
Dmitriy Zaporozhets
2014-04-04 15:15:43 +0000
7611ce72 Merge branch 'doc/ldap' into 'master' ... Browse Code »
```
Explain LDAP activation for existing users
```
Sytse Sijbrandij
2014-04-04 14:47:14 +0000
bb9ec711 Explain how existing users can enable LDAP Browse Code »

Jacob Vosmaer
2014-04-04 16:22:11 +0200
a6bc4f0c Merge branch 'small-feature-requests' into 'master' ... Browse Code »
```
Small feature requests

/cc @dzaporozhets
```
Sytse Sijbrandij
2014-04-04 13:52:27 +0000
e159a561 Ask for small feature requests. Browse Code »

dosire
2014-04-04 15:52:07 +0200
11f864c9 Update gitlab_git and gitlab-grit gem versions ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-04 15:22:03 +0300
1f1cfc9e Merge pull request #5950 from axilleas/bundler_parallel ... Browse Code »
```
Refer to bundler's ability of parallel installation
```
Dmitriy Zaporozhets
2014-04-04 14:37:07 +0300
ad3a3e52 Merge pull request #6658 from tsigo/rs-important-dirs ... Browse Code »
```
Make sure important directories exist in git
```
Dmitriy Zaporozhets
2014-04-04 14:31:26 +0300
14b68586 Merge branch 'no_email_on_notification_level_change' into 'master' ... Browse Code »
```
Don't send emails on notification level change
```
Dmitriy Zaporozhets
2014-04-04 09:30:16 +0000

a3af64b4 Merge branch 'add-one-line-upgrader-command' into 'master' ... Browse Code »

Add One Line Upgrader Command

This is related to my previous MR from one month ago. I've done a fresh checkout of master and reapplied the path so that the tree is clean again, as requested.

2014-04-04 08:32:08 +0000

0ecd7f79 Merge branch 'update_update_guides' into 'master' ... Browse Code »
```
Add to update guides satellites group permission.
```
Sytse Sijbrandij
2014-04-04 08:26:23 +0000