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

23 5月, 2014 21 次提交
- D
  Merge branch 'api-branch-deletion' into 'master' · a56e35e9
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
Api branch deletion

Fixes #1127
```
  a56e35e9
- D
  Improve branch deletion via API · d575ee3e
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d575ee3e
- M
  
  Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 68942dbb
  由 Marin Jankovski 提交于 5月 23, 2014
  
  68942dbb
- M
  
  Replace jquery deprecated .live with .on · 6990f8a8
  由 Marin Jankovski 提交于 5月 23, 2014
  
  6990f8a8
- D
  Merge branch 'merge-marshal' into 'master' · 66c9fa95
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
Merge marshal
```
  66c9fa95
- D
  Merge branch 'remove-features-raketask' into 'master' · c1da50c1
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
Remove features raketask

As discussed

Fixes #1179
```
  c1da50c1
- D
  Fix branch protection help doc · 8ae2d215
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8ae2d215
- D
  Mention changes to protected branches · 8ec38c17
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8ec38c17
- D
  Merge pull request #7011 from erbunao/drag-and-drop_markdown · fc861658
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
Implements drag and drop upload of image in every markdown-area
```
  fc861658
- E
  
  Implements drag and drop upload in creating issues · 6a85cdf1
  由 Earle Bunao & Neil Calabroso 提交于 5月 23, 2014
  
  6a85cdf1
- D
  Fix spinach tests · 696b9903
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  696b9903
- D
  Merge branch 'api-remove-branch' into 'master' · 9e6466c7
  由 Dmitriy Zaporozhets 提交于 5月 23, 2014
```
New rules for protected branches

This MR change permissions logic for branch removal. Changes listed below:

Before
* developer can remove branch with terminal but not in UI
* masters can remove any branch with UI even protected one
* force-push to protected branch is not allowed but remove is allowed

After
* none can force push or remove protected branches
* developers and masters can remove normal branches with console and UI
```
  9e6466c7
- D
  Merge branch 'fix-scroll-to' into 'master' · eee14a0c
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Fix js error when use scroll to highlighted line
```
  eee14a0c
- D
  Add missing feature flag to mr notes spec · ebe2a34a
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ebe2a34a
- D
  Fix tests · b192aa56
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b192aa56
- D
  Merge pull request #7002 from olafmandel/user_avatar_in_relative_root · 9f2183f9
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Fix avatar URLs in JS-lists for relative_url_root
```
  9f2183f9
- D
  Merge pull request #7005 from alankehoe/master · 94f8e801
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Update message on the group dashboard page
```
  94f8e801
- D
  First entries for 7.0 CHANGELOG · 8bf7b62e
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8bf7b62e
- D
  Merge branch 'improved-edit-file-ui' into 'master' · 05bff8b6
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Improved edit file ui

* remove ugly borders
* replace small buttons with tabs
* add spinner while diff is loading
```
  05bff8b6
- D
  Merge branch 'new-group-avatar' into 'master' · de8c43f6
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Ability to upload avatar when create new group

Before this change you dont know you can upload avatar for group until you visit group edit page.

After this change you are able to upload avatar during group creation
```
  de8c43f6
- D
  Lets start 7.0 development · babfc068
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  babfc068
22 5月, 2014 16 次提交
- D
  Improve protected branch explanation · b9d1fc2f
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b9d1fc2f
- D
  Fix scroll to highlighted line. Replace scrollTO js file with gem · 74079fe2
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  74079fe2
- M
  
  Add missing lines in update guide. · 3296fb9f
  由 Marin Jankovski 提交于 5月 22, 2014
  
  3296fb9f
- D
  
  The 4.0 raketask is no longer needed and rebuilding of missing satellites is automatic. · 114e6756
  由 dosire 提交于 5月 22, 2014
  
  114e6756
- D
  Dont allow remove of protected branch · 36cac35b
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  36cac35b
- D
  Api call to remove branch · a9d60b3b
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a9d60b3b
- D
  Improve branch-removal logic · 0455391a
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0455391a
- D
  Add BranchesHelper · e089b11b
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e089b11b
- D
  Delete branch service with permission checks · 88781783
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  88781783
- D
  Improve edit page UI/UX · 1ad174fb
  由 Dmitriy Zaporozhets 提交于 5月 22, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1ad174fb
- M
  
  Version to 6.9.0 · 38d0e001
  由 Marin Jankovski 提交于 5月 22, 2014
  
  38d0e001
- M
  
  Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · dc7158a0
  由 Marin Jankovski 提交于 5月 22, 2014
  
  dc7158a0
- M
  
  Required shell version is now 1.9.4. · b019c061
  由 Marin Jankovski 提交于 5月 22, 2014
  
  b019c061
- S
  Merge branch 'grammar_fixes' into 'master' · 66dfe37d
  由 Sytse Sijbrandij 提交于 5月 22, 2014
```
Grammar fixes

fixed typos in groups messages
```
  66dfe37d
- M
  
  Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into grammar_fixes · f5147780
  由 Marc Radulescu 提交于 5月 22, 2014
  
  f5147780
- M
  
  typos fixed · d1980adf
  由 Marc Radulescu 提交于 5月 22, 2014
  
  d1980adf
21 5月, 2014 3 次提交
- S
  Merge branch 'dev-setup-on-metal' into 'master' · 9f80ab8e
  由 Sytse Sijbrandij 提交于 5月 21, 2014
```
Dev setup on metal
```
  9f80ab8e
- D
  
  It now is a metal dev install. · 60053e6e
  由 dosire 提交于 5月 21, 2014
  
  60053e6e
- D
  Merge branch 'cloud-com' into 'master' · f420ae4b
  由 Dmitriy Zaporozhets 提交于 5月 21, 2014
```
Cloud com
```
  f420ae4b