Software Publico / Gitlab

07 Apr, 2014

25 commits

8df66046 Merge branch 'fix-faulty-namespaces' into 'master' ... Browse Code »
```
Fix faulty namespaces

Fixes #908

Now with updated schema.
```
Dmitriy Zaporozhets
2014-04-07 15:45:37 +0000
26c51020 Fix link in integration doc Browse Code »

Dmitriy Zaporozhets
2014-04-07 14:39:45 +0000
52cf11b9 add a space Browse Code »

Job van der Voort
2014-04-07 14:26:52 +0000
650d0bc6 Merge branch 'improve-oauth' ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
Dmitriy Zaporozhets
2014-04-07 17:15:31 +0300
6d196962 Fix faulty namespaces Browse Code »

Job van der Voort
2014-04-07 16:03:49 +0200
e6f58cb8 Avoid false validation when create user ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 16:47:37 +0300
5436d6af Make oauth works for google oauth too ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 16:36:33 +0300
021faad3 Add nickname to oauth_spec ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 16:03:05 +0300
5d6e9ea8 Merge branch 'link-to-github-app' into 'master' ... Browse Code »
```
Link to github app
```
Dmitriy Zaporozhets
2014-04-07 13:02:19 +0000
5b018cc5 Name should be oauth and not twitter. Browse Code »

dosire
2014-04-07 14:52:35 +0200
4ab32be8 Dont care about emails for oauth ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 15:20:40 +0300
e7f80806 Merge branch 'wording-of-link-text' into 'master' ... Browse Code »
```
Wording of link text
```
Dmitriy Zaporozhets
2014-04-07 12:18:04 +0000
db880cf3 Image for GitHub app setup. Browse Code »

dosire
2014-04-07 14:17:40 +0200
c06255e1 fix image link Browse Code »

Dmitriy Zaporozhets
2014-04-07 12:17:32 +0000
6e4dbde2 Improve actionability of notice. Browse Code »

dosire
2014-04-07 14:14:14 +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
84d17f79 Skip require email for devise controllers ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 14:32:59 +0300
a73df4f7 Allow oauth signup without email ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 14:09:29 +0300
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

3 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