Commits · 67b07f96ea6ce7a22d070da7e83724ed153e14ef · Boxiang Sun / gitlab-ce · GitLab

09 Apr, 2014 14 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 67b07f96
  Dmitriy Zaporozhets authored Apr 09, 2014
  
  67b07f96
- Merge branch 'ensure_satellite_exists' into 'master' · f23dcac9
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Ensure satellite exists instead of raising an error
```
  f23dcac9
- Merge branch 'clean_old_archives' into 'master' · 4e9add7c
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Clean old archives from repository downloads directory
```
  4e9add7c
- Merge branch 'wiki-refactoring' into 'master' · fae6eb63
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Wiki refactoring

Better names for variables and classes
```
  fae6eb63
- Dont raise an error with satellites, make sure it exists. · 63ba9835
  Marin Jankovski authored Apr 09, 2014
  
  63ba9835
- Add to clean archives to changelog. · 944ebb8e
  Marin Jankovski authored Apr 09, 2014
  
  944ebb8e
- Remove archives older than 2 hours. · b2959c41
  Marin Jankovski authored Apr 09, 2014
  
  b2959c41
- Use ProjectWiki instead of GollumWiki in code · 1bd28994
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1bd28994
- Refactor wiki model · 26ec74c4
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  26ec74c4
- Rename wiki variables · b27c42be
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b27c42be
- Merge branch 'issue_on_empty_repo' into 'master' · 71678f08
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Fix for error 500 on create issue for empty repo
```
  71678f08
- Typo fix in process.md · f5b7899c
  Jeroen van Baarsen authored Apr 09, 2014
  
  f5b7899c
- Merge branch 'installation-order' into 'master' · e099d662
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Installation order
```
  e099d662
- People forget to compile their assets, start after doing that. · 12c49dd9
  dosire authored Apr 09, 2014
  
  12c49dd9
08 Apr, 2014 26 commits
- Merge branch 'why-all-the-dev' into 'master' · 797813b9
  Sytse Sijbrandij authored Apr 08, 2014
```
Why all the dev packages

Document the need for dev packages since Multiple people asked about it.

/cc @marc @jacobvosmaer
```
  797813b9
- Nicer formulation. · b2b790af
  dosire authored Apr 08, 2014
  
  b2b790af
- Add issue to an empty repo, test. · e617cf95
  Marin Jankovski authored Apr 08, 2014
  
  e617cf95
- Merge branch 'indicate-it-is-a-filter' into 'master' · 9a02e27b
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Indicate it is a filter
```
  9a02e27b
- Document the need for dev packages since Multiple people asked about it. · 9924492a
  dosire authored Apr 08, 2014
  
  9924492a
- Update grape-entity · fead9678
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fead9678
- Merge branch 'gollum-lib' into 'master' · f382983f
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Use original gem gollum-lib
```
  f382983f
- Fix test broken by 89c94290 · 684877ac
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  684877ac
- Gollum use own constant now · 3aee31c0
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3aee31c0
- Use original gem gollum-lib · b82140c6
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b82140c6
- Fix procfile for developers · 24934c9b
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  24934c9b
- Merge branch 'update_development_details' into 'master' · c945ca3a
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Update development steps
```
  c945ca3a
- Revert "Allow to parse heroku-generated database.yml config file." · 665a6994
  Dmitriy Zaporozhets authored Apr 08, 2014
```
This reverts commit 8a56e7db.
Because it actually breaks db setup for mysql
```
  665a6994
- Merge branch 'forgot-to-change-dir' into 'master' · 5ea31c7f
  Sytse Sijbrandij authored Apr 08, 2014
```
Forgot to change dir

/cc @dzaporozhets

Related to https://gitlab.com/gitlab-com/doc-gitlab-com/issues/1
```
  5ea31c7f
- Also need to change the reference. · 2a9eb026
  dosire authored Apr 08, 2014
  
  2a9eb026
- Merge branch 'remove-nested-dir-in-docs' into 'master' · 862e0e34
  Sytse Sijbrandij authored Apr 08, 2014
```
Remove nested dir in docs

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

/cc @dzaporozhets
```
  862e0e34
- Remove nested images since they are not supported by https://gitlab.com/gitlab-com/doc-gitlab-com · 76ca5976
  dosire authored Apr 08, 2014
  
  76ca5976
- Update development steps. · 4df1a10e
  Marin Jankovski authored Apr 08, 2014
  
  4df1a10e
- Use placeholder to prevent using the find box to add new members. · 16567af9
  dosire authored Apr 08, 2014
  
  16567af9
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · e7087fbf
  Dmitriy Zaporozhets authored Apr 08, 2014
  
  e7087fbf
- More info about GitLab integrations with OAuth · 3b339a8b
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3b339a8b
- Merge branch 'irc-status' into 'master' · 603fa9e9
  Sytse Sijbrandij authored Apr 08, 2014
```
Irc status
```
  603fa9e9
- Officially supported irc might cause people to expect too much. · 688e4290
  dosire authored Apr 08, 2014
  
  688e4290
- Merge branch 'irc_update' into 'master' · 8969a2f0
  Sytse Sijbrandij authored Apr 08, 2014
```
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.
```
  8969a2f0
- Merge branch 'merge-request-officer' into 'master' · 6909705a
  Sytse Sijbrandij authored Apr 08, 2014
```
Merge Request Officer
```
  6909705a
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 1e8ed9d5
  Dmitriy Zaporozhets authored Apr 08, 2014
  
  1e8ed9d5