Commits · a502a2b85b2e9d8471fff0c0ae2757d2789cee57 · nexedi / gitlab-ce

23 May, 2014 22 commits
- Merge branch 'missing-items-changelog' into 'master' · a502a2b8
  Dmitriy Zaporozhets authored May 23, 2014
```
Missing items changelog
```
  a502a2b8
- Merge branch 'branch-creation-flow' into 'master' · de7d93e3
  Dmitriy Zaporozhets authored May 23, 2014
```
Branch creation flow

To improve user experience with web editing I did next improvements:

* when create branch via ui - redirect to tree view so you start add/edit files
* when click on branch name - redirect to tree view instead of commits so you can immedialty add/edit files
```
  de7d93e3
- Merge branch 'move-protected-branches' into 'master' · d906f19c
  Dmitriy Zaporozhets authored May 23, 2014
```
Move protected branches to Project settings page

Because all settings should be in one place
```
  d906f19c
- Merge branch 'license-to-bv' into 'master' · c8abf223
  Dmitriy Zaporozhets authored May 23, 2014
```
License to bv
```
  c8abf223
- Change the license to B.V. · 245c04c2
  dosire authored May 23, 2014
  
  245c04c2
- Merge branch 'api-branch-deletion' into 'master' · a56e35e9
  Dmitriy Zaporozhets authored May 23, 2014
```
Api branch deletion

Fixes #1127
```
  a56e35e9
- Improve branch deletion via API · d575ee3e
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d575ee3e
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 68942dbb
  Marin Jankovski authored May 23, 2014
  
  68942dbb
- Replace jquery deprecated .live with .on · 6990f8a8
  Marin Jankovski authored May 23, 2014
  
  6990f8a8
- Add threaded emails to changelog. · 8efc80ef
  dosire authored May 23, 2014
  
  8efc80ef
- Merge branch 'merge-marshal' into 'master' · 66c9fa95
  Dmitriy Zaporozhets authored May 23, 2014
```
Merge marshal
```
  66c9fa95
- Merge branch 'remove-features-raketask' into 'master' · c1da50c1
  Dmitriy Zaporozhets authored May 23, 2014
```
Remove features raketask

As discussed

Fixes #1179
```
  c1da50c1
- Fix tests · 484c0979
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  484c0979
- Move protected branches to Project settings · 695fd3cf
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  695fd3cf
- Branch link on branches page goes to tree view instead of commits · b44138ae
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b44138ae
- Redirect to tree view after branch created · a5e16243
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a5e16243
- Fix branch protection help doc · 8ae2d215
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8ae2d215
- Mention changes to protected branches · 8ec38c17
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8ec38c17
- Merge pull request #7011 from erbunao/drag-and-drop_markdown · fc861658
  Dmitriy Zaporozhets authored May 23, 2014
```
Implements drag and drop upload of image in every markdown-area
```
  fc861658
- Implements drag and drop upload in creating issues · 6a85cdf1
  Earle Bunao & Neil Calabroso authored May 23, 2014
  
  6a85cdf1
- Fix spinach tests · 696b9903
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  696b9903
- Merge branch 'api-remove-branch' into 'master' · 9e6466c7
  Dmitriy Zaporozhets authored May 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
22 May, 2014 18 commits
- Merge branch 'fix-scroll-to' into 'master' · eee14a0c
  Dmitriy Zaporozhets authored May 22, 2014
```
Fix js error when use scroll to highlighted line
```
  eee14a0c
- Add missing feature flag to mr notes spec · ebe2a34a
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ebe2a34a
- Fix tests · b192aa56
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b192aa56
- Merge pull request #7002 from olafmandel/user_avatar_in_relative_root · 9f2183f9
  Dmitriy Zaporozhets authored May 22, 2014
```
Fix avatar URLs in JS-lists for relative_url_root
```
  9f2183f9
- Merge pull request #7005 from alankehoe/master · 94f8e801
  Dmitriy Zaporozhets authored May 22, 2014
```
Update message on the group dashboard page
```
  94f8e801
- First entries for 7.0 CHANGELOG · 8bf7b62e
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8bf7b62e
- Merge branch 'improved-edit-file-ui' into 'master' · 05bff8b6
  Dmitriy Zaporozhets authored May 22, 2014
```
Improved edit file ui

* remove ugly borders
* replace small buttons with tabs
* add spinner while diff is loading
```
  05bff8b6
- Merge branch 'new-group-avatar' into 'master' · de8c43f6
  Dmitriy Zaporozhets authored May 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
- Lets start 7.0 development · babfc068
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  babfc068
- Improve protected branch explanation · b9d1fc2f
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b9d1fc2f
- Fix scroll to highlighted line. Replace scrollTO js file with gem · 74079fe2
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  74079fe2
- Add missing lines in update guide. · 3296fb9f
  Marin Jankovski authored May 22, 2014
  
  3296fb9f
- The 4.0 raketask is no longer needed and rebuilding of missing satellites is automatic. · 114e6756
  dosire authored May 22, 2014
  
  114e6756
- Dont allow remove of protected branch · 36cac35b
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  36cac35b
- Api call to remove branch · a9d60b3b
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a9d60b3b
- Improve branch-removal logic · 0455391a
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0455391a
- Add BranchesHelper · e089b11b
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e089b11b
- Delete branch service with permission checks · 88781783
  Dmitriy Zaporozhets authored May 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  88781783