home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
398 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 11:41:53 +02:00
Dmitriy Zaporozhets 69c193e78a Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 22:48:55 +02:00
Dmitriy Zaporozhets ff10543403 Move merge manually text below merge widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:55:01 +02:00
Dmitriy Zaporozhets cb6ad67f52 Merge branch 'check-out-branch-button' into 'master' 
Add "Check out branch" button to the MR page.

I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. 

Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120.

![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png)

It looks even better in combination with !1121, which gets rid of the "If you want to ..." line:

![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png)

cc @dzaporozhets @rspeicher 

See merge request !1116
 2015-08-11 17:49:06 +00:00
Dmitriy Zaporozhets 91836272fe Merge branch 'mr-widget-text' into 'master' 
Improve text of MR merge widget and manual merge modal

Modal with manual merge instructions:

![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png)

Archived:

![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png)

WIP:

![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png)

Missing target branch:

![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png)

Missing source branch:

![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png)

Nothing to merge:

![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png)

Checking ability to merge:

![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png)

Conflicts when allowed to merge:

![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png)

Conflicts when not allowed to merge:

![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png)

Mergeable when allowed to merge:

![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png)

Mergeable when not allowed to merge:

![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png)

Merge in progress:

![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png)

Merge failed:

![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png)

Merged:

![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png)

Closed:

![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png)

cc @dzaporozhets @rspeicher

See merge request !1120
 2015-08-11 19:24:50 +02:00
Dmitriy Zaporozhets eaba65fe50 Move command line insturction out of mr widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:24:42 +02:00
Dmitriy Zaporozhets 48e76c04a7 Refactor merge request widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:17:02 +02:00
Dmitriy Zaporozhets 3e0ba775ed Move command line insturction out of mr widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:15:49 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets 84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' " 
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
 2015-08-11 10:26:19 +02:00
Dmitriy Zaporozhets f293d991a4 Revert "Merge branch 'mr-widget-text' into 'master' " 
This reverts commit 151d9fb35f, reversing
changes made to 819d110cab.
 2015-08-11 10:26:12 +02:00
Douwe Maan 4a2b7cef57 Merge branch 'master' into check-out-branch-button 2015-08-10 14:16:40 +02:00
Douwe Maan 78fba275c9 More textual tweaks 2015-08-09 17:46:25 +02:00
Douwe Maan 211fe02848 Tweak MR widget text some more. 2015-08-08 21:51:50 +02:00
Douwe Maan b2334da40e Improve text in MR "How To Merge" modal. 2015-08-08 21:51:42 +02:00
Douwe Maan 9049cdff5a Add "Check out branch" button to the MR page. 2015-08-08 21:27:29 +02:00
Douwe Maan b8590da024 Improve MR merge widget text and UI consistency. 2015-08-08 21:24:43 +02:00
Dmitriy Zaporozhets 4773f38e28 Merge branch 'improve-merge-requests' into 'master' 
Improve merge requests

- [x] Fetch merge request refs by IID
- [x] Ability to fetch any merge request
- [x] Link commits and diffs in merge request to target project
- [x] Improve merge request UI and command line instructions
- [x] Check merge request widget loading test coverage double

See merge request !1115
 2015-08-07 14:44:54 +00:00
Dmitriy Zaporozhets fd2f907b01 Move command line insturction out of mr widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 16:04:17 +02:00
Dmitriy Zaporozhets 3cf4a981d6 Refactor merge request widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 15:17:10 +02:00
Douwe Maan ad55f0d6f9 Merge branch 'master' into comment-updated-by 2015-08-07 15:05:17 +02:00
Dmitriy Zaporozhets fe4b065202 Link mr commits/diffs to target project 
Now when changes in merge requests stored in target project we can
always link commits and diffs to target project. So even people without
access to fork can browse commits and diffs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 13:05:52 +02:00
Dmitriy Zaporozhets ab6aa8a48b Split merge conflict messages on 2 lines 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 17:22:45 +02:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Kamil Trzcinski 427b5df260 Added support for CI skipped status 2015-08-04 16:47:19 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Stan Hu 8221236df1 Update merge request text to reflect editability of source/target branch 
Closes #2134
 2015-08-03 07:11:04 -07:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Stan Hu ae3f869fd1 Fix the "Reload with full diff" URL button 
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.

Closes #2041
 2015-07-23 12:53:54 -07:00
Ben Boeckel 374b95c38e merge_requests: add fetch command to the MR page 2015-07-20 11:23:27 -04:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +02:00
Dmitriy Zaporozhets 2a6f522cac Implement merge from forks without satellites 2015-07-15 16:45:50 +02:00
Valery Sizov d2479a25c7 Time ago fix for compare page 2015-07-15 16:59:31 +03:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets f0e1da04f0 Show last push widget on several project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 23:21:35 +02:00
Robert Speicher f6503f71f9 Remove disableButtonIf[Any]EmptyField calls from forms 
These have been replaced by the "requiresInput" behavior.
 2015-06-26 22:07:59 -04:00
Dmitriy Zaporozhets 342d553709 Rename abilities to correspond contoller/model action names 
write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:55:56 +02:00
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:04:50 +02:00
Dmitriy Zaporozhets 60baa1e866 Move issuable partials in common directory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 15:11:22 +02:00
Dmitriy Zaporozhets 0c8b96bdbc Merge branch 'performance-improvements' into 'master' 
Performance improvements

* store @participants in variable
* store result of subscribed? call into variable

In total it reduce amount of SQL queries for issue or merge_request with 10 comments/participants almost twice.

See merge request !883
 2015-06-25 08:14:03 +00:00
Dmitriy Zaporozhets a3f64b195e Improve performance for merge_request#show page 
* store @participants in variable
* store result of subscribed? call into variable

In total it reduce amount of SQL queries for merge_request with 10
comments/participants twice.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-24 12:56:10 +02:00
Valery Sizov af93d447b6 Explicit error when commit not found in the GitLab CI 2015-06-23 14:50:06 +03:00
Dmitriy Zaporozhets cc9b5c49d1 Merge branch 'revert-mr-state-names' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
 2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets 7524d7c082 Revert merge request states renaming 
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 17:09:50 +02:00
Robert Speicher bc027c5183 Load the Merge Request > Commits tab lazily 2015-06-17 16:59:51 -04:00
Robert Speicher 8c8cd8be43 Update time_ago_with_tooltip helper 
Minor refactoring, add specs, changes arguments to use keywords.
 2015-06-17 16:37:10 -04:00
Robert Speicher e3c1818a3e Bootlint: Modals no longer need a '.hide' class 2015-06-16 13:32:33 -04:00
Dmitriy Zaporozhets 15cfa5ca20 Fix automerge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 18:49:34 +02:00