Software Publico / Gitlab | GitLab

Software Público Brasileiro

08 Apr, 2014

15 commits

665a6994 Revert "Allow to parse heroku-generated database.yml config file." ... Browse Code »
```
This reverts commit 8a56e7db485d3109f3b2f02896c1165c33ffa8fb.
Because it actually breaks db setup for mysql
```
Dmitriy Zaporozhets
2014-04-08 14:05:57 +0300
5ea31c7f Merge branch 'forgot-to-change-dir' into 'master' ... Browse Code »
```
Forgot to change dir

/cc @dzaporozhets

Related to https://gitlab.com/gitlab-com/doc-gitlab-com/issues/1
```
Sytse Sijbrandij
2014-04-08 10:38:54 +0000
2a9eb026 Also need to change the reference. Browse Code »

dosire
2014-04-08 12:38:24 +0200
862e0e34 Merge branch 'remove-nested-dir-in-docs' into 'master' ... Browse Code »
```
Remove nested dir in docs

Needed for https://gitlab.com/gitlab-com/doc-gitlab-com/issues/1

/cc @dzaporozhets
```
Sytse Sijbrandij
2014-04-08 10:29:41 +0000
76ca5976 Remove nested images since they are not supported by https://gitlab.com/gitlab-com/doc-gitlab-com Browse Code »

dosire
2014-04-08 12:28:59 +0200
e7087fbf Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-04-08 10:32:10 +0300
3b339a8b More info about GitLab integrations with OAuth ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-08 10:32:00 +0300
603fa9e9 Merge branch 'irc-status' into 'master' ... Browse Code »
```
Irc status
```
Sytse Sijbrandij
2014-04-08 07:26:58 +0000
688e4290 Officially supported irc might cause people to expect too much. Browse Code »

dosire
2014-04-08 09:26:26 +0200
8969a2f0 Merge branch 'irc_update' into 'master' ... Browse Code »
```
Update status of IRC in PROCESS doc

Just a small fix to update the official status of the IRC channel in the PROCESS.md doc.
```
Sytse Sijbrandij
2014-04-08 07:23:01 +0000
6909705a Merge branch 'merge-request-officer' into 'master' ... Browse Code »
```
Merge Request Officer
```
Sytse Sijbrandij
2014-04-08 07:17:26 +0000
1e8ed9d5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-04-08 09:32:26 +0300
7f2551ac Merge branch 'login_page' into 'master' ... Browse Code »
```
Add option to disable standard login
```
Dmitriy Zaporozhets
2014-04-08 06:32:02 +0000
7f148385 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-04-08 09:30:49 +0300
c4ef7f06 Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup ... Browse Code »
```
Allow to parse heroku-generated database.yml config file.
```
Dmitriy Zaporozhets
2014-04-08 09:30:08 +0300

07 Apr, 2014

25 commits

f64ccc3f Change IRC to official Browse Code »

Drew Blessing
2014-04-07 21:59:13 -0500
af5ea92c Merge branch 'master' into login_page ... Browse Code »
```
Conflicts:
	CHANGELOG
```
Marin Jankovski
2014-04-07 20:13:37 +0200
d238a21b Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook ... Browse Code »
```
Fix url generation error on hook invalid create
```
Dmitriy Zaporozhets
2014-04-07 19:55:09 +0300

e36108f7 Merge branch 'grammer_fix' into 'master' ... Browse Code »

Grammer Fix

Should read like:

```
Your project limit is 10 projects! Please contact your administrator to increase it
```
Instead of:

```
Your own projects limit is 10! Please contact administrator to increase it
```

2014-04-07 16:52:08 +0000

38ae34a3 Merge branch 'namespacefix-changelog' into 'master' ... Browse Code »
```
Namespacefix changelog

Forgot the changelog entry.
Thanks @sytse

Fixes #908
```
Dmitriy Zaporozhets
2014-04-07 16:31:16 +0000
8f2a4aa5 Merge pull request #6718 from pkgr/fix-procfile ... Browse Code »
```
Fix Procfile to be usable in production.
```
Dmitriy Zaporozhets
2014-04-07 19:25:30 +0300
be6cee23 add namespace fix to changelog Browse Code »

Job van der Voort
2014-04-07 18:24:08 +0200
d92e4830 Allow people to remove source branch of fork project in MR ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 19:11:02 +0300
d70939f6 Remove unnecessary sign * ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 18:59:10 +0300
3befe6ec Fix show/hide discussion link ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-04-07 18:57:57 +0300
fefa10c3 Merge branch 'breack-attack' into 'master' ... Browse Code »
```
Breack attack

Fixes #1104
```
Dmitriy Zaporozhets
2014-04-07 15:48:45 +0000
5307dd5f Comment gzip: off be default Browse Code »

Dmitriy Zaporozhets
2014-04-07 15:47:20 +0000
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
aea3712e Add option for disable standard signin. Browse Code »

Marin Jankovski
2014-04-07 17:11:06 +0200
8a56e7db Allow to parse heroku-generated database.yml config file. Browse Code »

Cyril Rohr
2014-04-07 15:48:51 +0100
459e6295 Fix Procfile to be usable in production. Browse Code »

Cyril Rohr
2014-04-07 15:45:52 +0100
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
43ecf68a Small edit. Browse Code »

dosire
2014-04-07 15:11:57 +0200
ac906b42 Simplify the contributing process and introduce MRO's. Browse Code »

dosire
2014-04-07 15:08:46 +0200
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