Commits · 28e13634dc9318dbd093a4561ee8ea16e1d71460 · nexedi / gitlab-ce

23 Jan, 2014 12 commits

Merge branch 'improve/mr_diff' · 28e13634

Dmitriy Zaporozhets authored Jan 23, 2014

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb

28e13634

Fix project model spec · 573f1f4a
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
573f1f4a

Fix tests · 71851a7e

Dmitriy Zaporozhets authored Jan 23, 2014

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

71851a7e

Fix mr specs · e013cd44
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
e013cd44
Fix satellites specs · 4cde3593
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
4cde3593
fix tests notes_on_merge_requests · 9db8cb3f
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
9db8cb3f
Fix public tests · 418660b9
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
418660b9
Fix project team tests · c3270875
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
c3270875
Fix MR spinach tests · 38034278
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
38034278
Version 6.5.1 · 68590fdd
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
68590fdd
Fix selectbox when submit MR from fork to origin · ccae561f
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
ccae561f
Fix HELP layout · 69ff7657
Dmitriy Zaporozhets authored Jan 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
69ff7657

22 Jan, 2014 28 commits
- Fix api merge request specs · cee68dec
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cee68dec
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 4742dba4
  Dmitriy Zaporozhets authored Jan 22, 2014
  
  4742dba4
- Merge pull request #6075 from skv-headless/remove_deprecated_finders · 4d56c359
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Remove deprecated finders
```
  4d56c359
- Make changes to tests · c227aa44
  Dmitriy Zaporozhets authored Jan 22, 2014
```
* project_with_code -> project
* project -> ermpty_project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c227aa44
- Always create merge_request_diff if MR created · 4b3afe23
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4b3afe23
- Merge branch 'warn-against-version-managers' into 'master' · bf15b56a
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Warn Against Version Managers
```
  bf15b56a
- Merge branch 'ugly-reference' into 'master' · 5745a510
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Ugly Reference

This prevents it displaying as < code > on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md
```
  5745a510
- No need for code tag here. · 3ff27c4b
  dosire authored Jan 22, 2014
  
  3ff27c4b
- Spelling mistake and add links. · a4f2da47
  dosire authored Jan 22, 2014
  
  a4f2da47
- Warn against RVM. · 3ba40f03
  dosire authored Jan 22, 2014
  
  3ba40f03
- Merge branch 'remove-github' into 'master' · 3fb22a1e
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Remove github specific mention of issue tracker
```
  3fb22a1e
- Remove GitHub mention because we also have a GitLab issue tracker now. · efbb4fbb
  dosire authored Jan 22, 2014
  
  efbb4fbb
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into improve/mr_diff · 94865a60
  Dmitriy Zaporozhets authored Jan 22, 2014
  
  94865a60
- Merge branch 'doc/6-0-to-6-5' into 'master' · dcc6ff5b
  Sytse Sijbrandij authored Jan 22, 2014
```
Replace 6.0-to-6.4.md with 6.0-to-6.5.md
```
  dcc6ff5b
- Replace 6.0-to-6.4.md with 6.0-to-6.5.md · 96ed6c45
  Jacob Vosmaer authored Jan 22, 2014
  
  96ed6c45
- Improve commit render performnace for MR show page · 51ea42e2
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  51ea42e2
- Set mr_diff state to collected if diff is ok · 39a86963
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  39a86963
- Render MR diff correctly · 193a5ed3
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  193a5ed3
- Remove commits/diff store login from MergeRequest model · 79bfbe59
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  79bfbe59
- MergeRequestDiff model responsoible for storing commits/diff info · d9be420e
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d9be420e
- Improve db schema for merge request diffs · de724a7a
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  de724a7a
- Create separate table to store Merge request commits/diffs · c983e8eb
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c983e8eb
- Add public assets to gitignore · 1018cbdc
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1018cbdc
- Version 6.5.0 · 51f06bad
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  51f06bad
- Use 6-5 branch in installation docs · bcedc485
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bcedc485
- Merge branch 'remove-old-twitter' into 'master' · 6c5606d2
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Remove Old Twitter
```
  6c5606d2
- Remove deprecated twitter handle. · 604b38cd
  dosire authored Jan 22, 2014
  
  604b38cd
- Merge pull request #6094 from sinm/patch-1 · d4e82f5e
  Dmitriy Zaporozhets authored Jan 22, 2014
```
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
```
  d4e82f5e