Commit Graph
19900 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f6fc176abb Fix rubocop issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 12:43:33 +02:00
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 9bf7bd27fa Merge branch 'kalibyrn/gitlab-ee-downcase-emails-for-hook'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-18 15:38:02 +02:00
Dmitriy Zaporozhets aa0d65818f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-08-18 15:35:31 +02:00
Dmitriy Zaporozhets 00b9c9e934 Merge branch 'improve-hook-messages' into 'master'
Include more information in hook error messages

When pushing commits to the remote, if a pre-receive hook gets triggered that prevents the push, it may not be clear which commit is causing the issue. Having the values of what caused the comparison to fail in the error message will help debugging, whether it be the user or the administrator.

See merge request !14
2015-08-18 13:33:37 +00:00
Sytse Sijbrandij 9cde642a61 Merge branch 'license-updates' into 'master'
Changed the EE license with the lawyers updates

See merge request !479
2015-08-17 23:39:10 +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
Darby 3623eed232 Changed the EE license with the lawyers updates 2015-08-17 15:35:58 -07:00
Dmitriy Zaporozhets 644a5c3a7a Merge branch 'ce-to-ee' into 'master'
CE to EE

See merge request !478
2015-08-17 17:33:25 +00:00
Dmitriy Zaporozhets 2e5e167311 Add 7.14 ce to ee doc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 18:10:58 +02:00
Dmitriy Zaporozhets 6b175d2e82 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 18:08:04 +02:00
Dmitriy Zaporozhets 478514b35b Merge branch 'installation-update-guides' into 'master'
Installation and update guides for 7.14

cc @rspeicher

See merge request !1168
2015-08-17 16:01:40 +00:00
Dmitriy Zaporozhets 5d862509c3 Create update guides for 7.14
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 17:18:09 +02:00
Dmitriy Zaporozhets dcd3396337 Update installation guide with 7.14
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 17:13:33 +02:00
Dmitriy Zaporozhets 88fb5c87ce Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-08-17 15:39:32 +02:00
Dmitriy Zaporozhets 48818c9a93 Merge branch 'ce-to-ee' into 'master'
Merge master from CE

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

See merge request !477
2015-08-17 13:38:54 +00:00
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
Robert Speicher 9f7c7c857b Merge branch 'rs-check-ruby-version' into 'master'
Require Ruby 2.1.0 in `gitlab:app:check` task

See merge request !1165
2015-08-16 00:06:36 +00:00
Robert Speicher 33c818d2d8 Require Ruby 2.1.0 in gitlab:app:check task
[ci skip]
2015-08-15 20:04:52 -04:00
Robert Schilling 18cbf07f8a Merge branch 'changelog-1124' into 'master'
Update changelog for MR !1124

@dzaporozhets

See merge request !1164
2015-08-15 22:06:19 +00:00
Sven Strickroth 18e9b01059 Update changelog for MR !1124
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-08-15 23:11:04 +02:00
Chris Rohr dfc8560bdf Added support for Jenkins unstable status 2015-08-15 09:32:55 -04:00
Robert Speicher 0b5dc5cd52 Merge branch 'rs-gem-security' into 'master'
Bump omniauth-saml to 1.4.1

Updates a vulnerable `ruby-saml` dependency.

- https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448
- https://github.com/onelogin/ruby-saml/pull/247

See merge request !1162
2015-08-15 03:30:15 +00:00
Robert Speicher adfcd57296 Bump omniauth-saml to 1.4.1
Updates a vulnerable `ruby-saml` dependency.

- https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448
- https://github.com/onelogin/ruby-saml/pull/247
2015-08-14 22:24:21 -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
Stan Hu 87ec6ae3a5 Merge branch 'fix/redirect_after_sign_in' into 'master'
Fix redirection after sign in when using auto_sign_in_with_provider

Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control.

See merge request !1146
2015-08-14 19:45:01 +00:00
Stan Hu 494afae08d Merge branch 'mysql_insecure_password_warnings' into 'master'
Workaround the insecure password warnings emitted by MySQL 5.6

When using MySQL 5.6, the following output is emitted every time a backup is created, even with CRON=1.

```
Warning: Using a password on the command line interface can be insecure.
```

This fix works around that by sending the password via the [`MYSQL_PWD`](http://dev.mysql.com/doc/refman/5.6/en/environment-variables.html) environment variable.

See merge request !1139
2015-08-14 17:12:57 +00:00
Stan Hu 317b7ad3e8 Merge pull request #9528 from revaret/Fixed_alignment_issue
Fix for #9527
2015-08-14 09:12:34 -07:00
Stan Hu d416a9d624 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-14 08:51:49 -07:00
Stan Hu 5824766252 Merge pull request #9562 from bladealslayer/fix/flowdock-gem-update
Update Flowdock integration to support new Flowdock API
2015-08-14 08:34:51 -07:00
Boyan Tabakov 88ab815b38 Update Flowdock integration to support new Flowdock API
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
2015-08-14 16:45:23 +02:00
Dmitriy Zaporozhets 3483024d93 Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'
Disable internal issue tracker if external tracker in use

### What does this MR do?

This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes.

### Why was this MR needed?

Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them.

### What are the relevant issue numbers?

Closes #2006

See merge request !993
2015-08-14 11:01:43 +00:00
Dmitriy Zaporozhets b6bdd650a5 Merge branch 'improve-readability' into 'master'
Set max-width for README, issue and merge request description

It allows easier text reading on big screens

### Problem

Text is hard to read on wide screens:

![Screenshot_2015-08-14_11.33.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bdb092c09495c7aa94b0589df4b7e65/Screenshot_2015-08-14_11.33.39.png)

### Solution

Set max-width to content. Screenshots:

![Screenshot_2015-08-14_11.31.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/00cd7a77b81b30458a1675ec562d7463/Screenshot_2015-08-14_11.31.54.png)
![Screenshot_2015-08-14_10.53.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4756f87a3bbb7179e55b1c8f8ee40459/Screenshot_2015-08-14_10.53.16.png)

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

See merge request !1161
2015-08-14 10:55:08 +00:00
Dmitriy Zaporozhets 8b9c129016 Add CHANGELOG item
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 11:35:48 +02:00
Dmitriy Zaporozhets ec910c3307 Set max-width for README, issue and merge request description
It allows easier text reading on big screens

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 11:29:45 +02:00
Dmitriy Zaporozhets e8889b154e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-14 11:20:39 +02:00
Dmitriy Zaporozhets 5f2562dfc5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-14 11:20:18 +02:00
Dmitriy Zaporozhets b665833370 Merge branch 'respect_filters' into 'master'
Fix: User search feature in admin area does not respect filters

https://dev.gitlab.org/gitlab/gitlabhq/issues/2482

See merge request !1155
2015-08-14 08:35:16 +00:00
Valery Sizov e58e75aa88 Fix: User search feature in admin area does not respect filters 2015-08-13 17:51:20 +03:00
ranjith 22eddffd41 Fixed #9527 2015-08-13 19:48:10 +05:30
Stan Hu f6f58cfb1f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-13 07:17:21 -07:00
Stan Hu a8e4c391cd Merge pull request #9556 from pupaxxo/patch-3
Fix changelog
2015-08-13 07:16:49 -07:00
Job van der Voort d891b23e62 Merge branch 'add-image' into 'master'
New doc about how to add an image in GitLab Basics

See merge request !1918
2015-08-13 12:05:16 +00:00
Robert Schilling f34c0b6a12 Merge pull request #9557 from pupaxxo/patch-4
Time for 7.14.0.pre
2015-08-13 13:46:51 +02:00
Dmitriy Zaporozhets 00a33d67aa Merge branch 'improve-hipchat-service-test' into 'master'
Provide more feedback what went wrong if HipChat service failed test

This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks.

Screenshot:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/10f82eb02db138f9680e69cdb3d3ed82/image.png)

Issue gitlab-com/support-forum#213

See merge request !1144
2015-08-13 11:43:44 +00:00
Andrea Ruggiero b3b0a1890e Time for 7.14.0.pre 2015-08-13 13:25:54 +02:00