Commits · 9b2a13497dfc1fc97ac5d84f4074729cda040e2a · Kirill Smelkov / gitlab-ce

26 May, 2014 6 commits
- Need txt file in test. · 9b2a1349
  Marin Jankovski authored May 26, 2014
  
  9b2a1349
- Remove empty space · 43e7b8fa
  Marin Jankovski authored May 26, 2014
  
  43e7b8fa
- Add image_service spec. · f8a6d340
  Marin Jankovski authored May 26, 2014
  
  f8a6d340
- Move logic to image_service. · 3b2b3cff
  Marin Jankovski authored May 26, 2014
  
  3b2b3cff
- Make existing tests test something, return correct errors. · 8bec6b0b
  Marin Jankovski authored May 26, 2014
  
  8bec6b0b
- Merge branch 'monthly_doc_update' into 'master' · 2a8aa742
  Marin Jankovski authored May 26, 2014
```
Monthly release doc update
```
  2a8aa742
24 May, 2014 9 commits
- Even more tests fixed :) · ef933ae6
  Dmitriy Zaporozhets authored May 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ef933ae6
- Fix help tests · bbc4b2be
  Dmitriy Zaporozhets authored May 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bbc4b2be
- Fix branches tests · 5a1429ae
  Dmitriy Zaporozhets authored May 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5a1429ae
- Fix specs. Fix note form reset after submit · 1bb9aeb5
  Dmitriy Zaporozhets authored May 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1bb9aeb5
- Merge branch 'ui-improvements' into 'master' · 7c6a58a7
  Dmitriy Zaporozhets authored May 24, 2014
```
Comment UI improvements

* use tabs for preview/write comment form because its better UX
* fix paddings for comment form and unnecessary borders
* remove unused css/js
* cleanup messy comment form html
```
  7c6a58a7
- Remove unused css · 50f3280e
  Dmitriy Zaporozhets authored May 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  50f3280e
- Improve notes form UI/UX · 5cfaf945
  Dmitriy Zaporozhets authored May 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5cfaf945
- Improve comments css · 0853eebd
  Dmitriy Zaporozhets authored May 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0853eebd
- Add drag-n-drop to CHANGELOG · cc28b21a
  Dmitriy Zaporozhets authored May 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cc28b21a
23 May, 2014 25 commits
- More stuff to CHANGELOG · 3e1853c5
  Dmitriy Zaporozhets authored May 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3e1853c5
- Merge branch 'explain-setting' into 'master' · 09fc3df9
  Dmitriy Zaporozhets authored May 23, 2014
```
Explain setting
```
  09fc3df9
- 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
- Project visibility setting is missed by people sometimes. · 7f84ba86
  dosire authored May 23, 2014
  
  7f84ba86
- 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