home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
19755 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets b583bb5fcb Make sure mr approve tests have satellite 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:55:46 +02:00
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets 39da3fa54b Fix call of non-existing method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 17:13:20 +02:00
Dmitriy Zaporozhets 19f5a37150 Merge branch 'ce-to-ee' into 'master' 
CE to EE



See merge request !474
 2015-08-10 14:59:06 +00:00
Dmitriy Zaporozhets 42b85f05a6 No satellites anymore 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:31:47 +02:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Dmitriy Zaporozhets 151d9fb35f 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-10 12:13:26 +00:00
Dmitriy Zaporozhets 819d110cab Merge branch 'trigger-hooks' into 'master' 
Trigger post-receive hooks after commits are made by GitLab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1127
 2015-08-10 11:57:53 +00:00
Dmitriy Zaporozhets 3752172dcd Merge branch 'fix-event-cache' into 'master' 
Fix event cache

Fixes #2236.

See merge request !1128
 2015-08-10 11:17:05 +00:00
Dmitriy Zaporozhets 59e7b7a654 Refactor Trigger post-receive hooks after commits are made by GitLab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 13:15:36 +02:00
Douwe Maan 0d1c260122 Fix event cache 2015-08-10 12:31:34 +02:00
Dmitriy Zaporozhets 99585a738c Trigger post-receive hoooks when commits are made by GitLab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 10:54:42 +02:00
Stan Hu 77f37fa909 Merge branch 'dropzone-upload-progress' into 'master' 
Add dropzone upload progress

This MR adds upload progress in percents to dropzone.

![progress](https://gitlab.com/vernik91/gitlab-ce/uploads/9be251e4f3a99bc1d65435b1f001d021/progress.png)

I thought, it can be nice small enhancement :)

See merge request !1125
 2015-08-10 08:05:37 +00:00
Dmitriy Zaporozhets c3a24cb81f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-08-10 09:57:49 +02:00
Nikita Verkhovin 17bab5022f Add dropzone upload progress 2015-08-10 13:18:02 +06:00
Robert Speicher fb6f8d9198 Merge branch 'rs-reference-data-attrs' into 'master' 
Add `data-[type]-id` attribute to reference links

This is to let us redact them later in another filter.

See merge request !1110
 2015-08-10 00:07:56 +00:00
Stan Hu 1a3283d4e8 Merge branch 'gravatar-host-link' into 'master' 
link to configured gravatar host on profile page

This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service.

See merge request !1093
 2015-08-09 22:42:07 +00:00
Robert Speicher b41c488b7d Merge branch 'fix-ghe-import' into 'master' 
Fix importing projects from GitHub Enterprise Edition.

Addresses #333.

See merge request !473
 2015-08-09 21:04:56 +00:00
Douwe Maan 78fba275c9 More textual tweaks 2015-08-09 17:46:25 +02:00
Douwe Maan 7b7802377e Merge branch 'master' into mr-widget-text 2015-08-09 17:40:59 +02:00
Douwe Maan e6bf9aa719 Make modal narrower 2015-08-09 17:34:28 +02:00
Douwe Maan caf8a94928 Fix spec 2015-08-09 17:31:01 +02:00
Dmitriy Zaporozhets b833f208f3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-09 10:31:38 +02:00
Dmitriy Zaporozhets 1309aeb871 Merge branch 'ui-improvements' into 'master' 
Ui improvements

* revert of wrong patch
* spall margin change

Explanation with screenshots here - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/579#note_1845510

See merge request !1117
 2015-08-09 08:30:48 +00:00
Stan Hu efb17e0599 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-09 00:51:20 -07:00
Stan Hu 91083d9ebb Merge pull request #9543 from rumpelsepp/english 
Improve abuse report wording
 2015-08-09 00:45:47 -07:00
Robert Speicher 8ceb7c0515 Merge branch 'rs-fix-msapplication-tileimage' into 'master' 
Fix transparency for msapplication-tile image

See merge request !1122
 2015-08-09 02:04:57 +00:00
Robert Speicher 48cf97e8d3 Merge branch 'cache-events' into 'master' 
Cache all events

Use CSS to determine if the current user needs to see "Congratulations! Tweet about it" by project creation events and "Create Merge Request" by push events.

Implemented as described here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/911#note_1559710

Addresses #2054, in part.

cc @dzaporozhets 

See merge request !1103
 2015-08-09 02:03:46 +00:00
Robert Speicher 3f045b25d7 Fix transparency for msapplication-tile image 
[ci skip]
 2015-08-08 22:03:00 -04:00
Robert Speicher 1f9487f7f4 Merge branch 'ldap-sync-group-members' into 'master' 
Disable adding, updating and removing members from a group that is
synced with LDAP.

Addresses #290.

See merge request !465
 2015-08-09 01:44:28 +00:00
Robert Speicher 32e63ba7a1 Add data-[type]-id attribute to reference links 
This is to let us redact them later in another filter.
 2015-08-08 16:43:29 -04: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 b8590da024 Improve MR merge widget text and UI consistency. 2015-08-08 21:24:43 +02:00
Stefan Tatschner 6783437ce5 Improve abuse report wording 2015-08-08 19:46:34 +02:00
Robert Speicher a71bed53e0 Merge branch 'merge-notifs' into 'master' 
See merge request !1077
 2015-08-07 18:47:02 -04:00
Achilleas Pipinellis 8ab6bd3eb3 Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227 2015-08-07 22:13:18 +03:00
Stan Hu 59c486dcc1 Merge branch 'fix-changelog-versions' into 'master' 
Fix CHANGELOG entries to belong in the right version

Reorder entries that were improperly grouped (one fix mentioned in #1522).

See merge request !1118
 2015-08-07 17:28:41 +00:00
Stan Hu 1681fd7b6e Fix entries to belong in the right version 2015-08-07 10:25:31 -07:00
Dmitriy Zaporozhets 1c3c232608 Revert "Put author name at the end of a tree row" 
This reverts commit ee0fc2c3ad.
 2015-08-07 18:12:15 +02:00
Dmitriy Zaporozhets 71158b11f2 Add more spacing between MR widget and tabs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 18:00:55 +02:00
Douwe Maan 0c31701932 Merge branch 'bitbucket-show-incompatible' into 'master' 
Show incompatible projects in Bitbucket import status

### What does this MR do?

This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table.

### Why was this MR needed?

Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fa).

### Screenshot

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/264b080114c809c4a3a79580594af8b2/image.png)

### What are the relevant issue numbers?

#1871

See merge request !1114
 2015-08-07 14:46:05 +00: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
Douwe Maan 0d5d80b735 Merge branch 'comment-updated-by' into 'master' 
Show who last edited a comment if it wasn't the original author

Fixes #1796.

The `updated_by` user is also tracked for issues and merge requests, but it isn't currently shown, because "edited by Person" would give the idea that Person edited the description, while most updates to those are assignee/milestone/labels, in which case who made that change is already visible in the comments.

See merge request !1075
 2015-08-07 14:44:28 +00:00
Stan Hu d7accda1ae Show incompatible projects in Bitbucket import status 
See #1871
 2015-08-07 07:07:08 -07: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
Douwe Maan 0228bdc59e Merge branch 'master' into fix-ghe-import 2015-08-07 15:47:53 +02:00
Douwe Maan 5472ded240 Fix importing projects from GitHub Enterprise Edition. 2015-08-07 15:44:53 +02:00
Douwe Maan 9b6c513bf7 Merge branch 'rs-group-convenience-methods' into 'master' 
Add `Group#add_*` convenience methods

Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.

See merge request !1111
 2015-08-07 13:31:25 +00: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