Commit Graph
9417 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ee3a0ed6dd yellow jenkins -> failed build
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 10:54:17 +02:00
Dmitriy Zaporozhets d72cc7fccd Merge branch 'jenkins_ci_status_handle_unstable_builds' of https://gitlab.com/chrisrohr/gitlab-ee into jenkins-tests 2015-08-19 10:51:35 +02:00
Dmitriy Zaporozhets 2178647a91 Merge branch 'ci_status_handle_automatic_branch_jobs_in_jenkins' into 'master'
Adding in ability to check status of automatic branch jobs in jenkins

The current documentation for integrating Jenkins and Gitlab EE indicates that the Gitlab Hook Plugin should be used.  When you use that plugin you can set up Jenkins to automatically create new jobs for the branches used in merge requests.  The CI Status check for Jenkins does not currently handle those automatic jobs.  The result of this is shows an error checking the status on all Merge Requests.  This merge request is a small change to the jenkins_service to utilize the ref param being passed in and appending the branch name if not master to the project url which will allow the status checks to succeed.

See merge request !9
2015-08-19 08:46:16 +00:00
Dmitriy Zaporozhets 23a8fc6bd3 Merge branch 'fix_jenkins_status' into 'master'
Add yellow/unstable build as a failure

Jenkins has more build statuses than any 'CI' tool I've ever seen. Apparently a build can be 'successful' but if tests fail it's called 'unstable'. However, 'unstable' is not considered a failing build. Bleh...

Anyway, GitLab needs to consider unstable or yellow builds a failure for CI purposes.

See merge request !11
2015-08-18 14:02:31 +00:00
Dmitriy Zaporozhets 88fb5c87ce Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-08-17 15:39:32 +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
Chris Rohr dfc8560bdf Added support for Jenkins unstable status 2015-08-15 09:32:55 -04:00
Sytse Sijbrandij 7359262f70 Merge branch 'spacing-fix' into 'master'
add missing space

From

> Restrict commits by author(email) to existing GitLab users

to

> Restrict commits by author (email) to existing GitLab users

See merge request !17
2015-08-14 21:10:41 +00: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 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
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
Douwe Maan e6bf9aa719 Make modal narrower 2015-08-09 17:34:28 +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 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
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
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