Commits · eea317795ea970f762a1331beba6fde20e7a8aeb · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

17 Mar, 2014 9 commits
- 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
- 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 4 commits
- 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
14 Mar, 2014 24 commits
- Merge branch 'snippets-page' into 'master' · 7c5320d2
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Render 404 instead of 500 if trying to see snippets of unexisting user

Fixes #1087
```
  7c5320d2
- Fix commit comment count css · f84d015f
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f84d015f
- JIRA project identifiers may also contain dashes '-' · 686128cd
  Daniel Lorch authored Mar 14, 2014
  
  686128cd
- Batch key import requires gitlab-shell 1.8.5 · 090ed21e
  Jacob Vosmaer authored Mar 14, 2014
  
  090ed21e
- Use batch_add_keys in `rake gitlab:shell:setup` · 779fa4a7
  Jacob Vosmaer authored Mar 13, 2014
  
  779fa4a7
- Change project lookup order for api · a9f2903e
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a9f2903e
- Project must have namespace for Project#find_with_namespace · 25f68a71
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  25f68a71
- Render 404 instead of 500 if trying to see snippets of unexisting user · a39eeba1
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a39eeba1
- Remove confusing code · 17a9ecf8
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  17a9ecf8
- Fix global search · e07b2f52
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e07b2f52
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 02b310df
  Dmitriy Zaporozhets authored Mar 14, 2014
  
  02b310df
- Clear rake task only if defined · fa3c087a
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fa3c087a
- Merge branch 'new_lines_markdown' into 'master' · 00815dd4
  Dmitriy Zaporozhets authored Mar 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
- Add to changelog changes for markdown. · ccc14fa2
  Marin Jankovski authored Mar 14, 2014
  
  ccc14fa2
- Ignore newlines per md standard. · f3ceebad
  Marin Jankovski authored Mar 14, 2014
  
  f3ceebad
- Fix mr process order on push. · b5d81174
  Dmitriy Zaporozhets authored Mar 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: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b5d81174
- Merge branch 'ldap_connections' · 1ec106b8
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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

Conflicts:
	CHANGELOG
	db/schema.rb
```
  0d7986a8
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 58e4e6b0
  Dmitriy Zaporozhets authored Mar 14, 2014
  
  58e4e6b0
- Override rake test · 8839339e
  Dmitriy Zaporozhets authored Mar 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8839339e