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

24 7月, 2014 14 次提交
- S
  
  Note exim problems. · 14d3f304
  由 Sytse Sijbrandij 提交于 7月 24, 2014
  
  14d3f304
- D
  Mention Explore page in CHANGELOG · bb80741c
  由 Dmitriy Zaporozhets 提交于 7月 24, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bb80741c
- D
  Fix test · c23e1f3d
  由 Dmitriy Zaporozhets 提交于 7月 24, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c23e1f3d
- D
  
  Merge branch 'cirosantilli-star' · 1fd43e1f
  由 Dmitriy Zaporozhets 提交于 7月 24, 2014
  
  1fd43e1f
- D
  Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star · e21ca9f8
  由 Dmitriy Zaporozhets 提交于 7月 24, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  e21ca9f8
- D
  Merge pull request #6650 from lloeki/wiki_images_attachments · 4a1e98e4
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Added ability to serve files in wiki repository
```
  4a1e98e4
- D
  Merge pull request #7089 from NARKOZ/api-patch · 66098dbb
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
API patch
```
  66098dbb
- D
  Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string · 931f27ae
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Ensure that uid in OAuth is a string
```
  931f27ae
- D
  Merge pull request #7318 from jvanbaarsen/constant-warning-fix · 9e613b91
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Removed some constant allready defined warnings
```
  9e613b91
- D
  Merge branch 'new_user_password_set' into 'master' · c29857ac
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Admin created user should get password reset link instead of mailed temporary password

Fixes #1405

See merge request !973
```
  c29857ac
- D
  Merge pull request #7332 from sugarmo/fix-graph-log-timeout · 945dd627
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Fix timeout error when preparing git graph.
```
  945dd627
- D
  Merge pull request #7316 from ayr-ton/master · ed234e34
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Add support to set satellites timeout
```
  ed234e34
- D
  Merge pull request #7340 from cirosantilli/diff-contrast · 136ff572
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
[UI] Increase diff byte highlight contrast.
```
  136ff572
- D
  Merge branch '7-2-dev' into 'master' · ac9b5bc0
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Explore area

Fixes #1426

See merge request !987
```
  ac9b5bc0
23 7月, 2014 10 次提交
- D
  Remove duplicate test · 001096ca
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  001096ca
- D
  Merge branch 'ruby-rake-check' into 'master' · 326fb383
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Ruby rake check

Fix #1456

See merge request !989
```
  326fb383
- D
  Merge branch 'improve-release-templates' into 'master' · a7c5d364
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Improve release templates

See merge request !985
```
  a7c5d364
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 69928796
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
  
  69928796
- D
  Merge branch 'fix-for-ruby-1-9' into 'master' · 2e3b92d7
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Fix for ruby 1.9

Fixes #1452

See merge request !988
```
  2e3b92d7
- D
  Refactor explore area tests. Replaced old links · f0bfeb6e
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f0bfeb6e
- D
  Refactor explore area · 367445fd
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  367445fd
- D
  Check ruby version to be >= 2.0.0 · 059f3a34
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  059f3a34
- D
  Force encoding utf-8 for ruby 1.9 · 667f40d2
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  667f40d2
- D
  Explore area · 1df0345e
  由 Dmitriy Zaporozhets 提交于 7月 23, 2014
```
Create one place for exploring GitLab instance projects and groups for
both signed in and anonymous users
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1df0345e
22 7月, 2014 10 次提交
- S
  
  Simplofy the tweet. · 7738383f
  由 Sytse Sijbrandij 提交于 7月 22, 2014
  
  7738383f
- J
  Merge pull request #7348 from creativepsyco/patch-1 · 561c308e
  由 Jeroen van Baarsen 提交于 7月 22, 2014
```
Typo fix.
```
  561c308e
- M
  
  Typo fix. · 0c0b737b
  由 Mohit Kanwal 提交于 7月 22, 2014
  
  0c0b737b
- D
  
  Merge branch 'public-groups' of https://github.com/innogames/gitlabhq into 7-2-dev · 6b4d5d21
  由 Dmitriy Zaporozhets 提交于 7月 22, 2014
  
  6b4d5d21
- D
  Version to 7.1.0 · 68a9203b
  由 Dmitriy Zaporozhets 提交于 7月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  68a9203b
- D
  Merge branch 'use_fullpath' into 'master' · 98c66b50
  由 Dmitriy Zaporozhets 提交于 7月 22, 2014
```
If referer in request is incorrect use fullpath

Fixes #1444

See merge request !982
```
  98c66b50
- M
  
  Call store_location_for once. · b4217500
  由 Marin Jankovski 提交于 7月 22, 2014
  
  b4217500
- D
  Merge branch 'fix-default-branch' into 'master' · 4f47eaf9
  由 Dmitriy Zaporozhets 提交于 7月 22, 2014
```
Fix project default branch change

It is a regression since 7.0. It was caused with switch to `strong_params`.

This MR is safe to merge and it fixes issue https://gitlab.com/gitlab-org/gitlab-ce/issues/433

See merge request !984
```
  4f47eaf9
- D
  Add useless test. Uncomment when we improve testing · af2a6ec1
  由 Dmitriy Zaporozhets 提交于 7月 21, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  af2a6ec1
- D
  Fix project default branch change · 2a4c73c0
  由 Dmitriy Zaporozhets 提交于 7月 21, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2a4c73c0
21 7月, 2014 6 次提交
- D
  Merge branch 'fix_signup_config' into 'master' · c5678d4e
  由 Dmitriy Zaporozhets 提交于 7月 21, 2014
```
Fix signup config

See merge request !983
```
  c5678d4e
- A
  
  Add support to set satellites timeout · 07537fac
  由 Ayrton Araújo 提交于 7月 15, 2014
  
  07537fac
- D
  Merge branch 'patch-email' into 'master' · 648cd134
  由 Dmitriy Zaporozhets 提交于 7月 21, 2014
```
Patch email

See merge request !981
```
  648cd134
- J
  Move signup_enabled and signin_enabled back · 285bb09b
  由 Jacob Vosmaer 提交于 7月 21, 2014
```
This partially reverts b5543be1 by restoring the nesting
for the signup_enabled and signin_enabled attributes.
```
  285bb09b
- M
  
  If the referer is not set, use fullpath. · 9714061b
  由 Marin Jankovski 提交于 7月 21, 2014
  
  9714061b
- D
  Merge branch 'file-upload-bugfix' into 'master' · cfde0936
  由 Dmitriy Zaporozhets 提交于 7月 21, 2014
```
Bugfix for Multiple File Upload Dialogs

Fixes issue #426, where a page with multiple dropzones can accidentally trigger multiple file upload dialogs when the user clicks the "selecting them" link.

By specifying the closest "div-dropzone-wrapper" before sending a click to "div-dropzone", duplicate events are prevented from firing.

See merge request !153
```
  cfde0936