Commit Graph
8955 Commits
Author SHA1 Message Date
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
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
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 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
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 86bccb71a1 Create ref for every merge request. Add documentation for fetch merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:54:58 +02:00
Dmitriy Zaporozhets 8dce66234f Fetch to mr code from fork to iid
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:35:04 +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
Robert Speicher fb6dc1f07d Add Group#add_* convenience methods
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-07 00:20:02 -04: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 c5eb2977d7 Merge branch 'add-current-user-to-autocomplete' into 'master'
Always add current user to autocomplete controller to support filter by "Me"

### What does this MR do?

This MR always adds the current user to the autocomplete list of users.

### Why was this MR needed?

Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list.

### What are the relevant issue numbers?

Partial fix #2202

See merge request !1100
2015-08-06 16:10:38 +00:00
Dmitriy Zaporozhets 2c46cf084b Merge branch 'fix-namespace-move-dir' into 'master'
Ensure old namespace directory exists before moving it

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

Fixes #983 

See merge request !1101
2015-08-06 16:09:11 +00: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
Dmitriy Zaporozhets d044c14290 Ensure old namespace directory exists before moving it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 12:31:24 +02:00
Douwe Maan 4f24eb2aa6 Merge branch 'master' into merge-notifs 2015-08-06 12:16:36 +02:00
Douwe Maan c6cbee846c Merge branch 'remove-email-from-published-keys' into 'master'
Only publish ssh key-type and key

Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys)

To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded.

See merge request !850
2015-08-06 09:05:15 +00: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
Douwe Maan 863f61343a Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes

* Closes #1804
* Closes #1359

See merge request !1084
2015-08-06 08:29:18 +00:00
Stan Hu 70f5291808 Always add current user to autocomplete controller to support filter by "Me"
Partial fix #2202
2015-08-06 00:46:14 -07: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
Sytse Sijbrandij 764124c380 Merge branch 'revert_touch' into 'master'
Revert "Update noteable after a new note is added"

This reverts commit fbdaf0e2a5.

https://gitlab.com/gitlab-org/gitlab-ce/issues/2027

See merge request !1094
2015-08-05 09:57:27 +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
Dmitriy Zaporozhets ab8c71de4e Fix merge request creation without branch selected
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-05 11:03:41 +02:00
Valery Sizov 6353ca9ae8 Revert "Update noteable after a new note is added"
This reverts commit fbdaf0e2a5.
2015-08-05 12:00:12 +03: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