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

10 9月, 2014 10 次提交
- M
  
  Revert "Delete mailer queue" · 976eb7a9
  由 Marin Jankovski 提交于 9月 10, 2014
  
  976eb7a9
- M
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · c091e6cf
  由 Marin Jankovski 提交于 9月 10, 2014
  
  c091e6cf
- J
  Merge branch 'use-canonical-repos' into 'master' · 62252049
  由 Jacob Vosmaer 提交于 9月 10, 2014
```
Use canonical repos

/cc @dzaporozhets

See merge request !1079
```
  62252049
- S
  
  Link to the canonical repos. · 07061b67
  由 Sytse Sijbrandij 提交于 9月 10, 2014
  
  07061b67
- S
  Merge branch 'testme_url' into 'master' · f2007e74
  由 Sytse Sijbrandij 提交于 9月 10, 2014
```
Fetch the testme repository from gitlab.com

See merge request !1078
```
  f2007e74
- J
  Fetch the testme repository from gitlab.com · b0435576
  由 Jacob Vosmaer 提交于 9月 10, 2014
```
The repository was removed from github.com/gitlabhq.
```
  b0435576
- R
  Merge pull request #7719 from williamherry/improve/improve_mysql_to_postgresql_doc · f905abc0
  由 Robert Schilling 提交于 9月 10, 2014
```
add bunder step to mysql_to_postgresql doc
```
  f905abc0
- W
  
  add bunder step to mysql_to_postgresql doc · 276ee454
  由 William Herry 提交于 9月 10, 2014
  
  276ee454
- R
  Merge pull request #7717 from bbodenmiller/patch-3 · bbe50443
  由 Robert Schilling 提交于 9月 09, 2014
```
fix formatting issue in installation guide
```
  bbe50443
- B
  fix formatting issue · 083b153d
  由 Ben Bodenmiller 提交于 9月 09, 2014
```
fix formatting issue with self-signed certificate section
```
  083b153d
09 9月, 2014 29 次提交
- D
  Prevent 500 error when search wiki for non-existing repo · 6b7e80cb
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6b7e80cb
- D
  Merge branch 'parallel_diff_refactor' into 'master' · 638331d0
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
```
  638331d0
- D
  Merge pull request #7695 from coverer/search_wiki · 0e78d00b
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Added search wiki feature
```
  0e78d00b
- D
  Merge branch 'bourne_shell' into 'master' · 04cf0745
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Wrap arguments for `[ -z` in double quotes

See merge request !1071
```
  04cf0745
- D
  Merge branch 'add-ci-to-blacklist' into 'master' · 0cff6df0
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Add ci to blacklist

See merge request !1075
```
  0cff6df0
- M
  
  Add diff_helper spec. · 8ebb26fc
  由 Marin Jankovski 提交于 9月 09, 2014
  
  8ebb26fc
- D
  Merge branch 'close_button_after_added_comment' into 'master' · 29e7647a
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Close button after added comment

Fixes #1549

See merge request !1070
```
  29e7647a
- D
  Merge branch 'api-project-path' into 'master' · 60ea455d
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
API: Project create docs miss path argument

Fixes #1551

See merge request !1074
```
  60ea455d
- M
  
  Fix typo. · 2ff83aa3
  由 Marin Jankovski 提交于 9月 09, 2014
  
  2ff83aa3
- M
  
  Add line code to parallel diff for linking. · ac6a107a
  由 Marin Jankovski 提交于 9月 09, 2014
  
  ac6a107a
- M
  
  Use the new path to the partial, move the diff related methods to the new helper. · 9c3935c5
  由 Marin Jankovski 提交于 9月 09, 2014
  
  9c3935c5
- M
  Merge branch 'refactor-diff-yeild' into 'parallel_diff_refactor' · be4359ef
  由 Marin Jankovski 提交于 9月 09, 2014
```
Refactor diffs

This refactoring done on top of Marin improvements to side-by-side diff.
Main target of this refactoring is to reduce mess and increase test coverage.

1. Use objects:
  * Gitlab::Diff::Line for line change in diff
  * Gitlab::Diff::File for file changes (diff + blob info)
2. Avoid `yield` magic
3. Move logic from views/helper to models/libs
4. Move diff views under separate dir `app/views/projects/diffs`

See merge request !1072
```
  be4359ef
- S
  
  Prevent people from using ci since we plan to host ci on /ci later. · 685757b9
  由 Sytse Sijbrandij 提交于 9月 09, 2014
  
  685757b9
- D
  Update project api docs · 8c765aaf
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8c765aaf
- D
  API: Create project - make sure project path is respected · a83975ab
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a83975ab
- D
  More entries to CHANGELOG · 4e4e1cb9
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4e4e1cb9
- D
  Merge pull request #7646 from bushong1/snippet-search3 · 9e4a4098
  由 Dmitriy Zaporozhets 提交于 9月 09, 2014
```
Adding in snippet search functionality
```
  9e4a4098
- S
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 002ce69e
  由 Sytse Sijbrandij 提交于 9月 09, 2014
  
  002ce69e
- S
  Merge branch 'fix-images-on-github' into 'master' · 9ae702b0
  由 Sytse Sijbrandij 提交于 9月 09, 2014
```
Fix images on github

Fixes https://dev.gitlab.org/gitlab/organization/issues/55

/cc @job @dzaporozhets

See merge request !1073
```
  9ae702b0
- S
  
  Fix images on GitHub and link to the about url. · 47b9ac66
  由 Sytse Sijbrandij 提交于 9月 09, 2014
  
  47b9ac66
- J
  Update the CHANGELOG for 7.2.1 · 3bffae33
  由 Jacob Vosmaer 提交于 8月 28, 2014
```
Conflicts:
	CHANGELOG
```
  3bffae33
- R
  Merge pull request #7630 from bbodenmiller/patch-3 · ee833ddc
  由 Robert Schilling 提交于 9月 09, 2014
```
add missing config files to check during release process
```
  ee833ddc
- D
  Fix usage of diff file mode change · 93dc8855
  由 Dmitriy Zaporozhets 提交于 9月 08, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  93dc8855
- D
  optimize show_diff_size_warning? · 02e87d92
  由 Dmitriy Zaporozhets 提交于 9月 08, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  02e87d92
- D
  Merge pull request #7697 from Razer6/fix_project_shortcuts · 3d1a246f
  由 Dmitriy Zaporozhets 提交于 9月 08, 2014
```
Change keyboard shortcut for activity to project
```
  3d1a246f
- D
  Refactoring inside refactoring. We need to go deeper · 218219ab
  由 Dmitriy Zaporozhets 提交于 9月 08, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  218219ab
- R
  
  Change shortcut for activity to project, because navbar changed · 7f7bf86b
  由 Robert Schilling 提交于 9月 08, 2014
  
  7f7bf86b
- D
  Specs for diff parser! Yay! · bde3f25d
  由 Dmitriy Zaporozhets 提交于 9月 08, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bde3f25d
- D
  Fix all broken stuff after diff refactoring · c741fcab
  由 Dmitriy Zaporozhets 提交于 9月 08, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c741fcab
08 9月, 2014 1 次提交
- S
  Merge branch 'omniauth_doc' into 'master' · 3e66c6a4
  由 Sytse Sijbrandij 提交于 9月 08, 2014
```
Omniauth doc

Fixes #1481

See merge request !1069
```
  3e66c6a4