home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
4837 Commits
Author SHA1 Message Date
Jeroen van Baarsen 4ac56fa1db Changed some stuff around after rebase 2014-05-23 20:26:31 +02:00
Jeroen van Baarsen d0e794cc1a Make sure the branch counter gets updated 
When you delete a branch, the counters wont get updated automaticly,
this happends because of the JS nature of the original call. I've
fixed this by responding with a JS file, and recalculate the counters.

Fixes: #6030
 2014-05-23 20:23:59 +02:00
Dmitriy Zaporozhets de7d93e31f Merge branch 'branch-creation-flow' into 'master' 
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 +00:00
Dmitriy Zaporozhets 484c09792c Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 14:33:20 +03:00
Dmitriy Zaporozhets 695fd3cf2c Move protected branches to Project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 14:25:55 +03:00
Dmitriy Zaporozhets b44138ae40 Branch link on branches page goes to tree view instead of commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 13:29:14 +03:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Dmitriy Zaporozhets 9e6466c784 Merge branch 'api-remove-branch' into 'master' 
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 +00:00
Dmitriy Zaporozhets 94f8e801a5 Merge pull request #7005 from alankehoe/master 
Update message on the group dashboard page
 2014-05-22 22:16:12 +03:00
Dmitriy Zaporozhets 05bff8b680 Merge branch 'improved-edit-file-ui' into 'master' 
Improved edit file ui

* remove ugly borders
* replace small buttons with tabs
* add spinner while diff is loading
 2014-05-22 17:35:41 +00:00
Dmitriy Zaporozhets de8c43f6f6 Merge branch 'new-group-avatar' into 'master' 
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 +00:00
Dmitriy Zaporozhets b9d1fc2f3b Improve protected branch explanation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 18:31:22 +03:00
Dmitriy Zaporozhets 0455391add Improve branch-removal logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:39:09 +03:00
Dmitriy Zaporozhets 1ad174fbcd Improve edit page UI/UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 12:25:44 +03:00
Marc Radulescu f5147780ff Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into grammar_fixes 2014-05-22 10:35:13 +02:00
Marc Radulescu d1980adf93 typos fixed 2014-05-22 10:35:01 +02:00
Mathieu Schroeter b3b0876e98 Add the http(s) command lines in the mails for the new origin when a project was moved in an other namespace. 2014-05-21 10:37:41 +02:00
Alan Kehoe b08fe47fe8 Update message on the group dashboard page 2014-05-20 22:03:34 +01:00
Dmitriy Zaporozhets d52a3281dc Merge branch 'small-ui-improvements' into 'master' 
Small ui improvements

* fix ugly errors block when admin save invalid user
* fix ugly errors when you tries to save invalid wiki page
 2014-05-20 15:44:45 +00:00
Dmitriy Zaporozhets ac46130748 Allow set group avatar when create group. Not only edit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:36:51 +03:00
Dmitriy Zaporozhets 1a4c9118ae Fix UI for wiki error message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:22:47 +03:00
Dmitriy Zaporozhets 9eb7fe6d06 Fix admin user errors ui 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:21:30 +03:00
Dmitriy Zaporozhets 85c5a20352 Small UI change to milestone page so it looks similar to issue/mr 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-19 13:34:26 +03:00
Metalaka 4593a0bc22 Add autofocus and tabindex. 2014-05-18 21:21:51 +00:00
NotSqrt 15e0ab498d Update ability to search in issue descriptions and comments 2014-05-15 19:54:19 +02:00
Dmitriy Zaporozhets a3a512f2ef Hide group dashboard and project sidebar for xs size 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 16:30:50 +03:00
Dmitriy Zaporozhets 0505a88299 Hide control elements and last login for xs display 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 16:30:21 +03:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Dmitriy Zaporozhets 3ea4bf4891 Merge pull request #6045 from jacargentina/fix-4305 
Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
 2014-05-13 12:29:54 +03:00
Dmitriy Zaporozhets 0401e19558 Merge pull request #6385 from cirosantilli/72-char-commit-msg 
Commit message textareas have 72 char mark line.
 2014-05-13 12:29:28 +03:00
Dmitriy Zaporozhets 0fd12a786a Merge pull request #6825 from sue445/feature/post_automerge 
Fix can not automerge when description is too long
 2014-05-13 12:26:42 +03:00
sue445 a3d8be09c6 Fix can not automerge if description is too long 2014-05-11 23:50:14 +09:00
Gregoire Daussin ea696805a7 Fix css rules conflict between .dark & a.dark classes 2014-05-09 17:58:23 +02:00
Dmitriy Zaporozhets 058c48845b Merge branch 'fix_merge_request_emails' into 'master' 
Remove markdown syntax from notification emails

Merge request notifications once again gained markdown syntax 😄 In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c5 and it was recently changed back to use the markdown style.
 2014-05-08 18:36:32 +00:00
Dmitriy Zaporozhets aa5f306d11 Merge pull request #6860 from hszcg/dev 
Add support for side-by-side inline comments
 2014-05-08 21:23:44 +03:00
Dmitriy Zaporozhets 536373ad05 Dont allow mr compare with empty branches 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 19:00:03 +03:00
Dmitriy Zaporozhets 86bf684f5d Minor UI improvements and fixed test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 16:30:39 +03:00
Dmitriy Zaporozhets 2da289cf22 Add assignee and milestone to 2nd step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:52:59 +03:00
Dmitriy Zaporozhets 51e976d295 Add assignee/milestone block to merge request edit page. And remove branches selector from this page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:40:02 +03:00
Dmitriy Zaporozhets 05e63fe09c MergeRequest#new 2 step process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:38:17 +03:00
Dmitriy Zaporozhets dd3a55064e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-07 14:57:26 +03:00
Dmitriy Zaporozhets 18529269c6 truncate long branch names on MR index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 14:43:07 +03:00
Dmitriy Zaporozhets fa7d0e3ae0 Fix MR widget UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 12:21:02 +03:00
Dmitriy Zaporozhets 118d06a3e2 Merge branch 'mobile_menu_help' into 'master' 
Fix mobile menu after adding help link

After https://github.com/gitlabhq/gitlabhq/pull/6897 the mobile menu ran off the left side of the screen. I don't see much we can do to squeeze all the items into mobile's width. I think hiding one of the items is acceptable and which is a matter of opinion.  I suggest hiding the user's avatar on mobile but the search icon or help icon would both be options as well. Let me know if you want a different icon hidden on mobile.

[Before Screenshot](https://www.dropbox.com/s/hnfmaln3ilcy0p7/Screen%20Shot%202014-05-02%20at%205.17.28%20PM.png)
[After Screenshot](https://www.dropbox.com/s/3ifxa8gfa12h37h/Screen%20Shot%202014-05-05%20at%204.52.25%20AM.png)
 2014-05-06 15:19:53 +00:00
Dmitriy Zaporozhets e640481625 Merge branch 'files_in_wiki' into 'master' 
Add support to show files from wiki repository on wiki pages
 2014-05-06 10:21:05 +00:00
Drew Blessing ad0f5fdc27 Improve mobile UI for issues and merge requests 2014-05-05 05:03:37 -05:00
Drew Blessing d210484205 Fix mobile menu after adding help link 2014-05-02 17:14:58 -05:00
Dmitriy Zaporozhets 993fc84855 Use sign icon style for help link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 22:00:23 +03:00
Dmitriy Zaporozhets c608a5dcea Add sort dropdown for admin projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 17:02:57 +03:00