Commits · 37192d5e184f73feebde9f571d34c6af2bbb8f7a · Kazuhiko Shiozaki / gitlab-ce · GitLab

17 Mar, 2014 32 commits
- Add more descriptive line for resolving sqlite error during check · 37192d5e
  Jamey J. DeOrio authored Jan 06, 2014
  
  37192d5e
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 11f20576
  Marin Jankovski authored Mar 17, 2014
  
  11f20576
- Add change to changelog. · 1c6e93ed
  Marin Jankovski authored Mar 17, 2014
  
  1c6e93ed
- Merge pull request #6529 from MrKeiKun/system-hook-fix · b36441f4
  Sytse Sijbrandij authored Mar 17, 2014
```
Fixed some minor typos
```
  b36441f4
- Merge branch 'links_within_same_repo' into 'master' · 493c7a61
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
```
  493c7a61
- Merge branch 'mysql-to-og' into 'master' · 66c4a7db
  Dmitriy Zaporozhets authored Mar 17, 2014
```
MySQL to Postgres script
```
  66c4a7db
- Postgresql conversion script. · 70994c34
  dosire authored Mar 17, 2014
  
  70994c34
- Default value for Snippet#private · de855e24
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  de855e24
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · cb43d88a
  Dmitriy Zaporozhets authored Mar 17, 2014
  
  cb43d88a
- Merge pull request #6544 from cirosantilli/show-link-to-public-projects-for-new-users · d5796975
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Show link to public projects for new users.
```
  d5796975
- Merge branch 'deeplink' into 'master' · 90d7ac3b
  Sytse Sijbrandij authored Mar 17, 2014
```
Deeplink

/cc @dzaporozhets
```
  90d7ac3b
- We have html targets for paragraphs now. · 67eb14d3
  dosire authored Mar 17, 2014
  
  67eb14d3
- Merge branch 'project-permissions' into 'master' · 0f204c32
  Dmitriy Zaporozhets authored Mar 17, 2014
```
API: Project permissions
```
  0f204c32
- Merge branch 'split-api-files' into 'master' · 63a8af67
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Move project members api to separate file
```
  63a8af67
- Fix tests · c02e3d44
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c02e3d44
- Add more api docs · 86c76ecc
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  86c76ecc
- Add tests for API project permissions info · 928b7f3b
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  928b7f3b
- Remove old entities · 0ea0e542
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0ea0e542
- Add current user permissions info to /api/projects/:id.json · eea31779
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  eea31779
- Use new grape-entity gem with fixed nested entities · a91a6491
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a91a6491
- Update markdown documentation, fix wiki spec. · 656d9548
  Marin Jankovski authored Mar 17, 2014
  
  656d9548
- Update wiki tests. · 3f818a3d
  Marin Jankovski authored Mar 17, 2014
  
  3f818a3d
- Wiki will show relative links related to the wiki gollum repository. · f04d5bfa
  Marin Jankovski authored Mar 17, 2014
  
  f04d5bfa
- Link to blob instead of linking to wiki. · 55e2f353
  Marin Jankovski authored Mar 17, 2014
  
  55e2f353
- Show link to public projects for new users. · 548f070f
  Ciro Santillli authored Mar 17, 2014
  
  548f070f
- Move project members api to separate file · 7c60713e
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7c60713e
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 7bce8748
  Dmitriy Zaporozhets authored Mar 17, 2014
  
  7bce8748
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 788723c3
  Dmitriy Zaporozhets authored Mar 17, 2014
  
  788723c3
- Restore old travis.yml · c0d2b976
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c0d2b976
- Merge pull request #6534 from dlorch/master · a7ac57a1
  Dmitriy Zaporozhets authored Mar 17, 2014
```
JIRA project identifiers may also contain dashes '-'
```
  a7ac57a1
- Merge branch 'update/changelog' into 'master' · a2ab57e9
  Sytse Sijbrandij authored Mar 17, 2014
```
Update/Changelog

Update the changelog to add the remaining 6.6.X entries
```
  a2ab57e9
- update changelog, add remainder 6.6.X changlog entries · cfabaa8b
  Arif Ali authored Mar 17, 2014
  
  cfabaa8b
16 Mar, 2014 3 commits
- Merge branch 'gmessner/gitlab-ce-issue-110' · 36c094b0
  Dmitriy Zaporozhets authored Mar 16, 2014
  
  36c094b0
- Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessner/gitlab-ce-issue-110 · fddbd7b2
  Dmitriy Zaporozhets authored Mar 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  fddbd7b2
- Merge branch 'dev-seeds' into 'master' · f3220aba
  Dmitriy Zaporozhets authored Mar 16, 2014
```
Improve developer seeds
```
  f3220aba
15 Mar, 2014 5 commits
- Fixed some minor typos. · ac09f6de
  Kei authored Mar 14, 2014
  
  ac09f6de
- Improve developer seeds · 39f80884
  Dmitriy Zaporozhets authored Mar 15, 2014
```
Return execution of observers in seeds.
Mute email sending to letter opening in you browser.
Added `rake dev` task to reset db and add seeds.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  39f80884
- Add comments fixtures for development · 6e73b208
  Dmitriy Zaporozhets authored Mar 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6e73b208
- Merge branch 'batch_key_import' into 'master' · ecae936d
  Dmitriy Zaporozhets authored Mar 15, 2014
```
Batch Key Import
```
  ecae936d
- Merge branch 'improve-project-lookup' into 'master' · 66a484c9
  Dmitriy Zaporozhets authored Mar 15, 2014
```
Improve Project Lookup

Fixes #1080
```
  66a484c9