home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
5114 Commits
Author SHA1 Message Date
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 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 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
Douwe Maan 0d1c260122 Fix event cache 2015-08-10 12:31:34 +02: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
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
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
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 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
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
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
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
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
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 a2d6af9772 Merge branch 'explore-markdown' into 'master' 
Apply markdown filter for project descriptions on explore view

When you open the explore page, then the project descriptions are not rendered correctly (e.g., https://gitlab.com/search?search=tortoisegit).

See merge request !1098
 2015-08-07 07:56:13 +00:00
Stan Hu a1e6fc157f Merge branch 'issue-2216' into 'master' 
Diff colors on MR Discussion like on Changes-tab

Fixes #2216

# Before
![Screen_Shot_2015-08-06_at_21.44.58](https://gitlab.com/gert/gitlab-ce/uploads/ed5935e0713dd58f9cd4b17a1fecaa86/Screen_Shot_2015-08-06_at_21.44.58.png)

# After
![Screen_Shot_2015-08-06_at_21.44.33](https://gitlab.com/gert/gitlab-ce/uploads/0816360afcc7cf860d2eadf8dd63b49e/Screen_Shot_2015-08-06_at_21.44.33.png)

See merge request !1108
 2015-08-07 04:28:10 +00:00
Dmitriy Zaporozhets 5fb5fd253a Merge branch 'nicer-merge-conflicts-widget' into 'master' 
Split merge conflict messages on 2 lines

Before

![Screenshot_2015-08-06_17.19.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a2757ca0a8f4acbf4152234e050b739e/Screenshot_2015-08-06_17.19.48.png)

After

![Screenshot_2015-08-06_17.22.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/11eeab533f98f008fb9548c0eb039aa3/Screenshot_2015-08-06_17.22.58.png)


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


See merge request !1107
 2015-08-06 20:35:36 +00:00
Gert Goet 7d2259b36f Diff colors on MR Discussion like on Changes-tab 
Fixes #2216
 2015-08-06 21:39:22 +02:00
Dmitriy Zaporozhets dcb0bf0df5 Merge branch 'report-spam' 2015-08-06 18:07:36 +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
Dmitriy Zaporozhets ed7a8c9221 Improve wording in abuse report form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:15:17 +02:00
Dmitriy Zaporozhets 4ba2698810 Remove selectbox from abuse form. Added pagination in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:13:47 +02:00
Douwe Maan e2b4f13b9b Add project name to project head 2015-08-06 15:10:51 +02:00
Dmitriy Zaporozhets 7a9d432cdb Add abuse report management in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:08:22 +02:00
Douwe Maan 9bd074d4cf Use display: inline where appropriate 2015-08-06 14:55:03 +02:00
Dmitriy Zaporozhets cba7f20dc8 Allow users to send abuse reports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 14:03:27 +02:00
Douwe Maan c015f96ba4 Cache all events 2015-08-06 13:15:33 +02:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Douwe Maan d6222d2273 Minor code tweak 2015-08-06 12:37:16 +02:00
Dmitriy Zaporozhets 4b3b286eef Merge branch 'tree-author-at-end' into 'master' 
Put author name at the end of a tree row

Put author name at the end of a tree row as the commit message is more important than the author name.

See merge request !579
 2015-08-06 08:59:25 +00:00
Sven Strickroth 5d4eec08a1 Apply markdown filter for project descriptions on explore view 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-08-05 21:26:49 +02:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Kamil Trzciński caf4c0dd87 Merge branch 'ci-skipped-status' into 'master' 
Added support for CI skipped status

This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216


See merge request !1073
 2015-08-05 10:09:07 +00:00
Dmitriy Zaporozhets c8d00787c2 Merge branch 'add-resend-confirm-email-admin-page' into 'master' 
Add "Confirm user" button to admin page

### What does this MR do?

This MR adds a "Confirm user" to the admin user page.

### Why was this MR needed?

There is no way for an admin to force a user confirmation. Some users create users in the API and then don't have a way to force the user into a confirmed state.

Originally, I attempted to add a link to allow the admin to resend a confirmation e-mail. But that may not be helpful because a user can be in the unconfirmed state with no `unconfirmed_email` set.

### Screenshot

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

### What are the relevant issue numbers?

* Closes #2116
* Closes https://github.com/gitlabhq/gitlabhq/issues/9502

See merge request !1067
 2015-08-05 09:43:03 +00:00
Dmitriy Zaporozhets 6caa03d422 Merge remote-tracking branch 'public/project-buttons' 2015-08-05 11:18:28 +02:00
Ben Bodenmiller 0f785bbc7e ink to configured gravatar host on profile page 2015-08-05 00:48:16 -07:00
Stan Hu 0c1ccda43f Add "Confirm user" button in user admin page 
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
 2015-08-05 00:35:53 -07:00
Sven Strickroth ee0fc2c3ad Put author name at the end of a tree row 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-08-05 00:12:13 +02:00
Kamil Trzcinski 427b5df260 Added support for CI skipped status 2015-08-04 16:47:19 +02:00