home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,237 Commits 48 Branches 340 Tags
f382983f1a136a58baffe911f8dec11bfcbea64b
Commit Graph
9237 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets f382983f1a Merge branch 'gollum-lib' into 'master' 
Use original gem gollum-lib
 2014-04-08 12:58:58 +00:00
Dmitriy Zaporozhets 684877acc4 Fix test broken by 89c942908c 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 15:58:28 +03:00
Dmitriy Zaporozhets 3aee31c00d Gollum use own constant now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 15:14:16 +03:00
Dmitriy Zaporozhets b82140c6a4 Use original gem gollum-lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 14:59:22 +03:00
Dmitriy Zaporozhets 24934c9b13 Fix procfile for developers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 14:38:57 +03:00
Dmitriy Zaporozhets c945ca3ad1 Merge branch 'update_development_details' into 'master' 
Update development steps
 2014-04-08 11:19:37 +00:00
Dmitriy Zaporozhets 665a69941b Revert "Allow to parse heroku-generated database.yml config file." 
This reverts commit 8a56e7db48.
Because it actually breaks db setup for mysql
 2014-04-08 14:05:57 +03:00
Sytse Sijbrandij 5ea31c7f74 Merge branch 'forgot-to-change-dir' into 'master' 
Forgot to change dir

/cc @dzaporozhets

Related to https://gitlab.com/gitlab-com/doc-gitlab-com/issues/1
 2014-04-08 10:38:54 +00:00
dosire 2a9eb02650 Also need to change the reference. 2014-04-08 12:38:24 +02:00
Sytse Sijbrandij 862e0e34d3 Merge branch 'remove-nested-dir-in-docs' into 'master' 
Remove nested dir in docs

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

/cc @dzaporozhets
 2014-04-08 10:29:41 +00:00
dosire 76ca5976de Remove nested images since they are not supported by https://gitlab.com/gitlab-com/doc-gitlab-com 2014-04-08 12:28:59 +02:00
Marin Jankovski 4df1a10e90 Update development steps. 2014-04-08 11:17:19 +02:00
Dmitriy Zaporozhets e7087fbfc4 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-04-08 10:32:10 +03:00
Dmitriy Zaporozhets 3b339a8b04 More info about GitLab integrations with OAuth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 10:32:00 +03:00
Sytse Sijbrandij 603fa9e9a0 Merge branch 'irc-status' into 'master' 
Irc status
 2014-04-08 07:26:58 +00:00
dosire 688e429094 Officially supported irc might cause people to expect too much. 2014-04-08 09:26:26 +02:00
Sytse Sijbrandij 8969a2f061 Merge branch 'irc_update' into 'master' 
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.
 2014-04-08 07:23:01 +00:00
Sytse Sijbrandij 6909705a3e Merge branch 'merge-request-officer' into 'master' 
Merge Request Officer
 2014-04-08 07:17:26 +00:00
Dmitriy Zaporozhets 1e8ed9d514 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-04-08 09:32:26 +03:00
Dmitriy Zaporozhets 7f2551ac21 Merge branch 'login_page' into 'master' 
Add option to disable standard login
 2014-04-08 06:32:02 +00:00
Dmitriy Zaporozhets 7f148385d4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-04-08 09:30:49 +03:00
Dmitriy Zaporozhets c4ef7f06a1 Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup 
Allow to parse heroku-generated database.yml config file.
 2014-04-08 09:30:08 +03:00
Drew Blessing f64ccc3f5b Change IRC to official 2014-04-07 21:59:13 -05:00
Marin Jankovski af5ea92cc4 Merge branch 'master' into login_page 
Conflicts:
	CHANGELOG
 2014-04-07 20:13:37 +02:00
Dmitriy Zaporozhets d238a21bcb Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook 
Fix url generation error on hook invalid create
 2014-04-07 19:55:09 +03:00
Dmitriy Zaporozhets e36108f75b Merge branch 'grammer_fix' into 'master' 
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 +00:00
Dmitriy Zaporozhets 38ae34a301 Merge branch 'namespacefix-changelog' into 'master' 
Namespacefix changelog

Forgot the changelog entry.
Thanks @sytse

Fixes #908
 2014-04-07 16:31:16 +00:00
Dmitriy Zaporozhets 8f2a4aa544 Merge pull request #6718 from pkgr/fix-procfile 
Fix Procfile to be usable in production.
 2014-04-07 19:25:30 +03:00
Job van der Voort be6cee2354 add namespace fix to changelog 2014-04-07 18:24:08 +02:00
Dmitriy Zaporozhets d92e4830f7 Allow people to remove source branch of fork project in MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 19:11:02 +03:00
Dmitriy Zaporozhets d70939f680 Remove unnecessary sign * 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 18:59:10 +03:00
Dmitriy Zaporozhets 3befe6ec33 Fix show/hide discussion link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 18:57:57 +03:00
Dmitriy Zaporozhets fefa10c3c2 Merge branch 'breack-attack' into 'master' 
Breack attack

Fixes #1104
 2014-04-07 15:48:45 +00:00
Dmitriy Zaporozhets 5307dd5f74 Comment gzip: off be default 2014-04-07 15:47:20 +00:00
Dmitriy Zaporozhets 8df66046d9 Merge branch 'fix-faulty-namespaces' into 'master' 
Fix faulty namespaces

Fixes #908

Now with updated schema.
 2014-04-07 15:45:37 +00:00
Marin Jankovski aea3712e8d Add option for disable standard signin. 2014-04-07 17:11:06 +02:00
Cyril Rohr 8a56e7db48 Allow to parse heroku-generated database.yml config file. 2014-04-07 15:48:51 +01:00
Cyril Rohr 459e629591 Fix Procfile to be usable in production. 2014-04-07 15:45:52 +01:00
Dmitriy Zaporozhets 26c5102002 Fix link in integration doc 2014-04-07 14:39:45 +00:00
Job van der Voort 52cf11b9f2 add a space 2014-04-07 14:26:52 +00:00
Dmitriy Zaporozhets 650d0bc695 Merge branch 'improve-oauth' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-04-07 17:15:31 +03:00
Job van der Voort 6d19696267 Fix faulty namespaces 2014-04-07 16:03:49 +02:00
Dmitriy Zaporozhets e6f58cb87d Avoid false validation when create user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:47:37 +03:00
Dmitriy Zaporozhets 5436d6afd6 Make oauth works for google oauth too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:36:33 +03:00
dosire 43ecf68af0 Small edit. 2014-04-07 15:11:57 +02:00
dosire ac906b427a Simplify the contributing process and introduce MRO's. 2014-04-07 15:08:46 +02:00
Dmitriy Zaporozhets 021faad3fe Add nickname to oauth_spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:03:05 +03:00
Dmitriy Zaporozhets 5d6e9ea8ef Merge branch 'link-to-github-app' into 'master' 
Link to github app
 2014-04-07 13:02:19 +00:00
dosire 5b018cc5b1 Name should be oauth and not twitter. 2014-04-07 14:52:35 +02:00
Dmitriy Zaporozhets 4ab32be8a7 Dont care about emails for oauth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 15:20:40 +03:00