提交 · acaf297846907bff096dcbd71d6665ac6d4b8abc · 李少辉-开发者 / gitlab-foss

18 3月, 2014 3 次提交
- J
  Merge pull request #5993 from DarkHorseComics/bypass-commented-sqlite · acaf2978
  由 Jacob Vosmaer 提交于 3月 18, 2014
```
Explain what to do about legacy sqlite in database.yml
```
  acaf2978
- D
  Merge branch 'check_orphaned_users_groups' into 'master' · 8fa53ce4
  由 Dmitriy Zaporozhets 提交于 3月 18, 2014
```
Check Orphaned Users Groups
```
  8fa53ce4
- J
  
  Add more descriptive line for resolving sqlite error during check · 37192d5e
  由 Jamey J. DeOrio 提交于 1月 06, 2014
  
  37192d5e
17 3月, 2014 32 次提交
- M
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 11f20576
  由 Marin Jankovski 提交于 3月 17, 2014
  
  11f20576
- M
  
  Add change to changelog. · 1c6e93ed
  由 Marin Jankovski 提交于 3月 17, 2014
  
  1c6e93ed
- S
  Merge pull request #6529 from MrKeiKun/system-hook-fix · b36441f4
  由 Sytse Sijbrandij 提交于 3月 17, 2014
```
Fixed some minor typos
```
  b36441f4
- D
  Merge branch 'links_within_same_repo' into 'master' · 493c7a61
  由 Dmitriy Zaporozhets 提交于 3月 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
- D
  Merge branch 'mysql-to-og' into 'master' · 66c4a7db
  由 Dmitriy Zaporozhets 提交于 3月 17, 2014
```
MySQL to Postgres script
```
  66c4a7db
- D
  
  Postgresql conversion script. · 70994c34
  由 dosire 提交于 3月 17, 2014
  
  70994c34
- D
  Default value for Snippet#private · de855e24
  由 Dmitriy Zaporozhets 提交于 3月 17, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  de855e24
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · cb43d88a
  由 Dmitriy Zaporozhets 提交于 3月 17, 2014
  
  cb43d88a
- D
  Merge pull request #6544 from cirosantilli/show-link-to-public-projects-for-new-users · d5796975
  由 Dmitriy Zaporozhets 提交于 3月 17, 2014
```
Show link to public projects for new users.
```
  d5796975
- J
  
  Drop UsersGroup orphans using `rails runner` · 5e7e814e
  由 Jacob Vosmaer 提交于 3月 17, 2014
  
  5e7e814e
- S
  Merge branch 'deeplink' into 'master' · 90d7ac3b
  由 Sytse Sijbrandij 提交于 3月 17, 2014
```
Deeplink

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

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

Conflicts:
	CHANGELOG
```
  fddbd7b2
- D
  Merge branch 'dev-seeds' into 'master' · f3220aba
  由 Dmitriy Zaporozhets 提交于 3月 16, 2014
```
Improve developer seeds
```
  f3220aba
- K
  
  Fixed some minor typos. · ac09f6de
  由 Kei 提交于 3月 14, 2014
  
  ac09f6de
15 3月, 2014 1 次提交

由 Dmitriy Zaporozhets 提交于 3月 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: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

39f80884