Software Publico / Gitlab

23 May, 2014

20 commits

de7d93e3 Merge branch 'branch-creation-flow' into 'master' ... Browse Code »

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

2014-05-23 13:06:32 +0000

d906f19c Merge branch 'move-protected-branches' into 'master' ... Browse Code »
```
Move protected branches to Project settings page

Because all settings should be in one place
```
Dmitriy Zaporozhets
2014-05-23 13:06:01 +0000
c8abf223 Merge branch 'license-to-bv' into 'master' ... Browse Code »
```
License to bv
```
Dmitriy Zaporozhets
2014-05-23 13:05:26 +0000
245c04c2 Change the license to B.V. Browse Code »

dosire
2014-05-23 15:01:02 +0200
a56e35e9 Merge branch 'api-branch-deletion' into 'master' ... Browse Code »
```
Api branch deletion

Fixes #1127
```
Dmitriy Zaporozhets
2014-05-23 12:51:09 +0000
d575ee3e Improve branch deletion via API ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-23 15:34:02 +0300
68942dbb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq Browse Code »

Marin Jankovski
2014-05-23 14:07:57 +0200
6990f8a8 Replace jquery deprecated .live with .on Browse Code »

Marin Jankovski
2014-05-23 14:07:42 +0200
66c9fa95 Merge branch 'merge-marshal' into 'master' ... Browse Code »
```
Merge marshal
```
Dmitriy Zaporozhets
2014-05-23 11:57:22 +0000
c1da50c1 Merge branch 'remove-features-raketask' into 'master' ... Browse Code »
```
Remove features raketask

As discussed

Fixes #1179
```
Dmitriy Zaporozhets
2014-05-23 11:56:52 +0000
484c0979 Fix tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-23 14:33:20 +0300
695fd3cf Move protected branches to Project settings ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-23 14:25:55 +0300
b44138ae Branch link on branches page goes to tree view instead of commits ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-23 13:29:14 +0300
a5e16243 Redirect to tree view after branch created ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-23 13:27:35 +0300
8ae2d215 Fix branch protection help doc ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-23 13:22:10 +0300
8ec38c17 Mention changes to protected branches ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-23 13:19:39 +0300
fc861658 Merge pull request #7011 from erbunao/drag-and-drop_markdown ... Browse Code »
```
Implements drag and drop upload of image in every markdown-area
```
Dmitriy Zaporozhets
2014-05-23 12:24:39 +0300
6a85cdf1 Implements drag and drop upload in creating issues Browse Code »

Earle Bunao & Neil Calabroso
2014-05-23 16:22:42 +0800
696b9903 Fix spinach tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-23 09:47:58 +0300

9e6466c7 Merge branch 'api-remove-branch' into 'master' ... Browse Code »

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

2014-05-23 06:06:22 +0000

22 May, 2014

20 commits

eee14a0c Merge branch 'fix-scroll-to' into 'master' ... Browse Code »
```
Fix js error when use scroll to highlighted line
```
Dmitriy Zaporozhets
2014-05-22 20:17:15 +0000
ebe2a34a Add missing feature flag to mr notes spec ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 22:44:32 +0300
b192aa56 Fix tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 22:34:34 +0300
9f2183f9 Merge pull request #7002 from olafmandel/user_avatar_in_relative_root ... Browse Code »
```
Fix avatar URLs in JS-lists for relative_url_root
```
Dmitriy Zaporozhets
2014-05-22 22:17:04 +0300
94f8e801 Merge pull request #7005 from alankehoe/master ... Browse Code »
```
Update message on the group dashboard page
```
Dmitriy Zaporozhets
2014-05-22 22:16:12 +0300
8bf7b62e First entries for 7.0 CHANGELOG ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 20:40:25 +0300
05bff8b6 Merge branch 'improved-edit-file-ui' into 'master' ... Browse Code »
```
Improved edit file ui

* remove ugly borders
* replace small buttons with tabs
* add spinner while diff is loading
```
Dmitriy Zaporozhets
2014-05-22 17:35:41 +0000

de8c43f6 Merge branch 'new-group-avatar' into 'master' ... Browse Code »

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

2014-05-22 17:35:14 +0000

babfc068 Lets start 7.0 development ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 20:34:03 +0300
b9d1fc2f Improve protected branch explanation ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 18:31:22 +0300
74079fe2 Fix scroll to highlighted line. Replace scrollTO js file with gem ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 18:19:50 +0300
3296fb9f Add missing lines in update guide. Browse Code »

Marin Jankovski
2014-05-22 16:27:32 +0200
114e6756 The 4.0 raketask is no longer needed and rebuilding of missing satellites is automatic. Browse Code »

dosire
2014-05-22 14:40:38 +0200
36cac35b Dont allow remove of protected branch ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 15:38:47 +0300
a9d60b3b Api call to remove branch ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 14:39:50 +0300
0455391a Improve branch-removal logic ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 14:39:09 +0300
e089b11b Add BranchesHelper ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 14:38:48 +0300
88781783 Delete branch service with permission checks ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 14:23:20 +0300
1ad174fb Improve edit page UI/UX ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-22 12:25:44 +0300
38d0e001 Version to 6.9.0 Browse Code »

Marin Jankovski
2014-05-22 11:09:00 +0200