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

17 3月, 2014 8 次提交
- 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
- 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 3 次提交
- 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
15 3月, 2014 7 次提交
- D
  Improve developer seeds · 39f80884
  由 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
- D
  Add comments fixtures for development · 6e73b208
  由 Dmitriy Zaporozhets 提交于 3月 15, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6e73b208
- D
  Merge branch 'batch_key_import' into 'master' · ecae936d
  由 Dmitriy Zaporozhets 提交于 3月 15, 2014
```
Batch Key Import
```
  ecae936d
- D
  Merge branch 'improve-project-lookup' into 'master' · 66a484c9
  由 Dmitriy Zaporozhets 提交于 3月 15, 2014
```
Improve Project Lookup

Fixes #1080
```
  66a484c9
- D
  Merge branch 'snippets-page' into 'master' · 7c5320d2
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Render 404 instead of 500 if trying to see snippets of unexisting user

Fixes #1087
```
  7c5320d2
- D
  Fix commit comment count css · f84d015f
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f84d015f
- D
  
  JIRA project identifiers may also contain dashes '-' · 686128cd
  由 Daniel Lorch 提交于 3月 14, 2014
  
  686128cd
14 3月, 2014 22 次提交
- J
  
  Batch key import requires gitlab-shell 1.8.5 · 090ed21e
  由 Jacob Vosmaer 提交于 3月 14, 2014
  
  090ed21e
- J
  
  Use batch_add_keys in `rake gitlab:shell:setup` · 779fa4a7
  由 Jacob Vosmaer 提交于 3月 13, 2014
  
  779fa4a7
- D
  Change project lookup order for api · a9f2903e
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a9f2903e
- D
  Project must have namespace for Project#find_with_namespace · 25f68a71
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  25f68a71
- D
  Render 404 instead of 500 if trying to see snippets of unexisting user · a39eeba1
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a39eeba1
- D
  Remove confusing code · 17a9ecf8
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  17a9ecf8
- D
  Fix global search · e07b2f52
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e07b2f52
- D
  
  Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 02b310df
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
  
  02b310df
- D
  Clear rake task only if defined · fa3c087a
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fa3c087a
- D
  Merge branch 'new_lines_markdown' into 'master' · 00815dd4
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
New Lines Behaviour in Markdown

Per markdown specification, only render line-breaks when you end a line with two or more spaces.
```
  00815dd4
- M
  
  Add to changelog changes for markdown. · ccc14fa2
  由 Marin Jankovski 提交于 3月 14, 2014
  
  ccc14fa2
- M
  
  Ignore newlines per md standard. · f3ceebad
  由 Marin Jankovski 提交于 3月 14, 2014
  
  f3ceebad
- D
  Fix mr process order on push. · b5d81174
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
First close merge requests that being merged. Then update code of open
mr. This fixes bug when MR merged via command line lose their diff
because code reload was before MR close.
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b5d81174
- D
  Merge branch 'ldap_connections' · 1ec106b8
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  1ec106b8
- D
  Require gitlab-shell v1.8.4 · bce8edbb
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bce8edbb
- D
  
  Merge branch 'dzaporozhets/gitlabhq-import-timeout' · f0a417df
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
  
  f0a417df
- D
  Fix specs · ac6b9faf
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ac6b9faf
- D
  Fix project creation test · b007cadf
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b007cadf
- D
  Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq... · 0d7986a8
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
```
  0d7986a8
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 58e4e6b0
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
  
  58e4e6b0
- D
  Override rake test · 8839339e
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8839339e
- D
  Merge pull request #6526 from mavimo/patch-1 · cad79433
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Fixed error on mysql install link
```
  cad79433