Commit Graph
3003 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
Douwe Maan 0f2616b365 Merge branch 'ldap-group-links-api-doc-fix' into 'master'
Make the `provider` argument for the LDAP group links API endpoint required

Related to #329

If no `provider` is passed to the API endpoint, the group link is not created properly. Making it required fixes the issue temporarily. It should default to the first provider.

Next step, as mentioned in #329, is to do that.

/cc @job

See merge request !475
2015-08-17 23:24:30 +00: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
Patricio Cano 671b891e0a Added required provider parameter to test 2015-08-11 17:55:03 -05:00
Patricio Cano 8290e5d979 Temporarily disable test that expects the correct behavior of LDAP Group Links API, even though it only checks for the response and not the actual changes in the DB 2015-08-11 17:36:49 -05: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
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
Douwe Maan caf8a94928 Fix spec 2015-08-09 17:31:01 +02: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
Robert Speicher a71bed53e0 Merge branch 'merge-notifs' into 'master'
See merge request !1077
2015-08-07 18:47:02 -04: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
Stan Hu d7accda1ae Show incompatible projects in Bitbucket import status
See #1871
2015-08-07 07:07:08 -07: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 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 dcb0bf0df5 Merge branch 'report-spam' 2015-08-06 18:07:36 +02:00
Douwe Maan 674e1c7458 Fix spec 2015-08-06 17:15:37 +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 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
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
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02: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 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
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
Dmitriy Zaporozhets 44ac823e59 Improve tests to use real branches in merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 17:20:26 +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
Dmitriy Zaporozhets c17f5d06aa Fix merge api and spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:33:53 +02:00
Zeger-Jan van de Weg 4ccd767abf Only publish ssh key-type and key 2015-08-04 14:33:18 +02:00
Dmitriy Zaporozhets b118f648cb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-03 11:04:04 +02:00
Stan Hu b8433cb886 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-02 12:53:08 -07:00
Atsushi Ishida f33898ecfb Re-annotate models 2015-08-03 01:52:54 +09:00
Stan Hu ecbe119af1 Fix "Network" and "Graphs" pages for branches with encoded slashes
Closes #1359
2015-08-02 00:07:23 -07:00
Stan Hu 208e07fe6f Fix errors deleting and creating branches with encoded slashes
Closes #1804
2015-08-01 23:33:33 -07:00
Robert Speicher 3f84c8a680 Merge branch 'api-useremails' into 'master'
Add ability to manage user email addresses via the API.

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181

See merge request !1066
2015-07-31 20:40:51 +00:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Douwe Maan 51e5f379dd Merge branch 'master' into api-useremails 2015-07-31 14:34:53 +02:00
Stan Hu 0abe98f049 Fix multi-line syntax highlighting
HTML span elements only apply to a single line, and in the case of multi-line
comments, the highlighting was dropped as a result. Ensure that each line has
the proper styling to fix this.

Closes #1577
2015-07-30 22:37:53 -07:00
Robert Speicher a51a3fb8ed Merge branch 'rs-mr-1050-followup' into 'master'
Add spec to RelativeLinkFilter for Unicode filenames

Adds specs for changes added in !1050

See merge request !1078
2015-07-31 01:47:41 +00:00
Robert Speicher 327013ace9 Merge branch 'rs-markdown-feature-pipelines' into 'master'
Prepare Markdown feature spec for testing multiple pipelines

This MR lays the groundwork for including or excluding certain HTML::Pipeline
filters depending on what we're parsing. For example, excluding reference
filters in the Issues and Merge Requests titles.

See merge request !1053
2015-07-31 01:35:02 +00:00
Robert Speicher a876db48d9 Merge branch 'api-new-attributes' into 'master'
Add project star and fork count, group avatar URL and user/group web URL attributes to API

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521.

See merge request !1058
2015-07-30 21:38:48 +00:00
Robert Speicher 4e22dcb6a3 Add spec to RelativeLinkFilter for Unicode filenames 2015-07-30 17:25:07 -04:00
Douwe Maan fa9004c78c Send notification to all participants when MR is merged. 2015-07-30 15:29:43 +02:00
Douwe Maan 1c7a8b8c27 Fix docs 2015-07-30 11:41:59 +02:00
Robert Speicher 8e01b8368a Merge branch 'ldap-sync-notifications' into 'master'
Don't send "Added to group" notifications when group is LDAP synched

Addresses gitlab/gitlab-ee#313.

See merge request !463
2015-07-29 21:18:36 +00:00
Stan Hu 3e9b612306 Check that project was actually created rather than just validated in import:repos task
Add gitlab-shell to error message to give user a clue that something may be wrong there.

Ran into this in #2082. User was told that repositories were created when they were
not due to hooks symlink being wrong.
2015-07-29 10:49:13 -07:00