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

21 7月, 2014 1 次提交

Merge branch 'fix/avatar_relative_url' into 'master' · 72f50fcb

由 Dmitriy Zaporozhets 提交于 7月 21, 2014

Fix Avatar and Relative URL

Fixes https://github.com/gitlabhq/gitlabhq/issues/7270

Instead of `URI::join` use a simple join with a slash. This is how all other places in GitLab join URLs and it doesn't muck with the relative path.

See merge request !144

72f50fcb

20 7月, 2014 3 次提交
- D
  Mention email change in README · 6a10e2e5
  由 Dmitriy Zaporozhets 提交于 7月 20, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6a10e2e5
- D
  Merge branch 'change-admin-email' into 'master' · 91ab8570
  由 Dmitriy Zaporozhets 提交于 7月 20, 2014
```
Change admin email

Related to #1446

See merge request !979
```
  91ab8570
- D
  Merge branch 'rc-twitter' into 'master' · d8af5259
  由 Dmitriy Zaporozhets 提交于 7月 19, 2014
```
Rc twitter

/cc @marin

See merge request !978
```
  d8af5259
19 7月, 2014 1 次提交
- D
  
  Change deafult admin email to example.com · c86962e0
  由 Dmitriy Zaporozhets 提交于 7月 19, 2014
  
  c86962e0
18 7月, 2014 2 次提交
- S
  
  Improve rc tweet. · 3926150f
  由 Sytse Sijbrandij 提交于 7月 18, 2014
  
  3926150f
- S
  Merge branch 'release-template' into 'master' · 84b6163b
  由 Sytse Sijbrandij 提交于 7月 18, 2014
```
Release template

See merge request !974
```
  84b6163b
17 7月, 2014 10 次提交
- D
  Merge branch 'release-candidate' into 'master' · b634d280
  由 Dmitriy Zaporozhets 提交于 7月 17, 2014
```
Release candidate

* add 7.0-7.1 update doc
* add 6.0-7.1 update doc
* update installation doc
* Bump version

Part of #1435

See merge request !977
```
  b634d280
- D
  Update guide from 6.0 to 7.1 · 2bd20b7c
  由 Dmitriy Zaporozhets 提交于 7月 17, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2bd20b7c
- D
  Version to rc1 · 4db9c6e0
  由 Dmitriy Zaporozhets 提交于 7月 17, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4db9c6e0
- D
  Point installation manual to 7-1-stable · f59a721e
  由 Dmitriy Zaporozhets 提交于 7月 17, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f59a721e
- D
  Update guide from 7.0 to 7.1 · 771f4dbc
  由 Dmitriy Zaporozhets 提交于 7月 17, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  771f4dbc
- D
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · f10c189b
  由 Dmitriy Zaporozhets 提交于 7月 17, 2014
  
  f10c189b
- J
  Merge branch 'doc/fix_update_doc_links' into 'master' · 2bccce2e
  由 Jeroen van Baarsen 提交于 7月 17, 2014
```
Fix links in Update guide 5.1 to 6.0

Links have missing slashes and additionally point to `master` branch.
This MR prevents a 404 error (missing slash) and points to the correct branch (6-0-stable) for comparison of the config files.

/cc @sytse
```
  2bccce2e
- J
  Merge branch 'fix-typo' into 'master' · 90544305
  由 Jeroen van Baarsen 提交于 7月 17, 2014
```
Fix typos in CONTRIBUTING.md

This MR fixes two typos in [CONTRIBUTING.md](CONTRIBUTING.md).
```
  90544305
- J
  Merge pull request #7257 from cirosantilli/patch-4 · d5d6fc3d
  由 Jeroen van Baarsen 提交于 7月 16, 2014
```
Clariy squash comes after review.
```
  d5d6fc3d
- S
  
  Ensure the readme answers the most important questions. · c3007888
  由 Sytse Sijbrandij 提交于 7月 16, 2014
  
  c3007888
16 7月, 2014 17 次提交
- D
  Fix user params when edit from admin area · de582ab3
  由 Dmitriy Zaporozhets 提交于 7月 16, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  de582ab3
- S
  
  Seperate CE in EE merge. · 9e3694a6
  由 Sytse Sijbrandij 提交于 7月 16, 2014
  
  9e3694a6
- S
  
  Make rc1 for GitLab.com complete and fix boldness. · 332a3c6d
  由 Sytse Sijbrandij 提交于 7月 16, 2014
  
  332a3c6d
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · aa25c0ff
  由 Dmitriy Zaporozhets 提交于 7月 16, 2014
  
  aa25c0ff
- D
  
  Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 2f78e6d0
  由 Dmitriy Zaporozhets 提交于 7月 16, 2014
  
  2f78e6d0
- D
  Fix typo in CHANGELOG · cc5a5a03
  由 Dmitriy Zaporozhets 提交于 7月 16, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cc5a5a03
- S
  Merge pull request #7314 from axilleas/houndci_single_quotes · 150aadad
  由 Sytse Sijbrandij 提交于 7月 16, 2014
```
Make houndci prefer single quotes.
```
  150aadad
- D
  Merge branch 'release-template' into 'master' · 13f5e360
  由 Dmitriy Zaporozhets 提交于 7月 16, 2014
```
Release template

See merge request !972
```
  13f5e360
- A
  
  Make houndci prefer single quotes. · e9a92381
  由 Achilleas Pipinellis 提交于 7月 16, 2014
  
  e9a92381
- S
  
  Link to issues with # · c3a7d3e1
  由 Sytse Sijbrandij 提交于 7月 16, 2014
  
  c3a7d3e1
- D
  Merge branch 'release-template' into 'master' · e3df8bf0
  由 Dmitriy Zaporozhets 提交于 7月 16, 2014
```
Release template

Consider moving stuff like the packages from the 22nd to the 21st

See merge request !971
```
  e3df8bf0
- D
  More stuff to CHANGELOG · 4f00d8fd
  由 Dmitriy Zaporozhets 提交于 7月 16, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4f00d8fd
- D
  If MR commits are empty if does not mean compare failed · 9879c427
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9879c427
- S
  
  Split work to the 17th and make issue template. · e043da13
  由 Sytse Sijbrandij 提交于 7月 15, 2014
  
  e043da13
- D
  Default gix max size to 20mb · a6546f51
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a6546f51
- D
  Merge branch 'fix-huge-mr' into 'master' · 2d6c4d2b
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Fix huge merge requests

* Refactored suppress logic for diffs
* Increase grit memory limit (should mix most of 502 errors when create MR)
* show first 100 files for huge diffs

Fixes #1424

See merge request !970
```
  2d6c4d2b
- D
  Fix tests · 1d596526
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1d596526
15 7月, 2014 6 次提交
- D
  Refactor diff suppress logic and diff views · be5b6db8
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  be5b6db8
- D
  Merge branch 'show_milestone_status_on_show_page' into 'master' · d1001e3d
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Show milestone status on group milestone show page

Closes #1430

See merge request !969
```
  d1001e3d
- D
  Cleanup diff stats UI · 3dc347a3
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3dc347a3
- D
  Refactor MR build process · 45623089
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  45623089
- D
  Increase grit memory limit · 3780444c
  由 Dmitriy Zaporozhets 提交于 7月 15, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3780444c
- M
  
  Fix test for no milestone description. · b916bf43
  由 Marin Jankovski 提交于 7月 15, 2014
  
  b916bf43