Commit Graph
18287 Commits
Author SHA1 Message Date
Douwe Maan 903132bc07 Merge branch 'fix-ext-issue-webbased-hooks' into 'master'
Fix hooks for web based events with external issue references

The creation of cross references for external issues (which would fail)
is now prevented. This fixes a 500 error and the execution of hooks when
creating a merge request or commenting on one.

Fixes #1650, GH-9333.

This regression might have been introduced by
8f8a8ab32b. There is actually a TODO by
@rspeicher mentioning external issues which is lost (unhandled) in a
later commit.

This fix is related to !766 and !804 which fix a similar issue for hooks for
Git based events.

See merge request !794
2015-06-16 11:36:31 +00:00
Job van der Voort b65f40b5c0 Merge branch 'update-release-doc' into 'master'
Update release doc

See merge request !1865
2015-06-16 09:56:30 +00:00
Dmitriy Zaporozhets e840ccaf15 Merge branch 'db-dump-instructions' into 'master'
Improve DB dump instructions

See merge request !1868
2015-06-16 09:33:45 +00:00
Jacob Vosmaer 6000c7199e Improve DB dump instructions 2015-06-16 10:00:02 +02:00
Valery Sizov 698f79e8b5 Merge branch 'new_syntax_yaml' into 'master'
New syntax of .gitlab-ci.yml

See merge request !1862
2015-06-16 07:52:03 +00:00
Nicolas d8209aebdc Fix layout issue in header title truncation. 2015-06-16 04:16:26 +02:00
Nicolas 4cf7d8d956 Fix consistency issues on New Application page. 2015-06-15 21:27:20 +02:00
Nicolas f18a24f0ac Fix layout issue when New Application validation fails. 2015-06-15 21:27:15 +02:00
Valery Sizov f715bc7b70 new syntax of .gitlab-ci.yml 2015-06-15 19:38:35 +03:00
Dmitriy Zaporozhets 5fa0248966 Merge branch 'fix-gitlab-ci-yml' into 'master'
Look for .gitlab-ci.yml only if checkout_sha is present

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2396

cc @vsizov

See merge request !818
2015-06-15 16:29:19 +00:00
Marin Jankovski 4c317531b4 If kerberos is enabled require it. 2015-06-15 18:04:30 +02:00
Dmitriy Zaporozhets 0674bf2339 Look for .gitlab-ci.yml only if checkout_sha is present
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-15 17:54:42 +02:00
Dmitriy Zaporozhets fe51fa26a7 Dont set checkout sha for removed branch/tag
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-15 17:54:22 +02:00
Jacob Vosmaer fc4160eb38 Add 'build RC1 packages' to monthly release steps 2015-06-15 16:53:01 +02:00
Jacob Vosmaer 83ce6cddc7 The changelogs are kept up to date continuously 2015-06-15 16:52:01 +02:00
Job van der Voort cbba28bdb6 Merge branch 'blog-post-in-advance' into 'master'
Prepare blog post in advance

Prepare the blog posts template directly after merging the old one. This way people can add add items that should not be forgotten during the month.

See merge request !816
2015-06-15 14:02:34 +00:00
Dmitriy Zaporozhets 6c7131b469 Merge branch 'fix-ext-issue-tracker-hook' into 'master'
Fix external issue tracker hook/test for HTTPS URLs

If HTTPS was used for the 'project_url' of an external issue tracker, an
error was raised because a HTTP connection was established to the
default HTTPS port.

The code has been corrected and simplified by using HTTParty.
Additionally, the request now is made directly to the 'project_url'
instead of the extracted root path.

## The bug is reproducible on gitlab.com
1. Set up a new external issue service (I used Redmine)
2. Set the project URL to 'http://example.com/redmine/projects/x' and
  click on 'Test settings' => Ok
3. Now set the URL to 'https://example.com/redmine/projects/x' and test
  it again => 500

## What is actually happening?
Web servers behave differently when a non-SSL connection is established
to a SSL port:
- Nginx / Apache 2.4: Status code 400
- Apache 2.2: <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">...
  (no status code line is sent)
- example.com: Empty response, no status code line

## Relevant log entries
```
2015-06-04T11:10:47.972Z 16785 TID-exfks WARN: {"retry"=>true, "queue"=>"project_web_hook", "class"=>"ProjectServiceWorker", "args"=>[...], "error_message"=>"wrong status line: \"<!DOCTYPE HTML PUBLIC \\\"-//IETF//DTD HTML 2.0//EN\\\">\"", "error_class"=>"Net::HTTPBadResponse", ...}
2015-06-04T11:10:47.972Z 16785 TID-exfks WARN: wrong status line: "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">"
2015-06-04T11:10:47.972Z 16785 TID-exfks WARN: /usr/lib/ruby/2.1.0/net/http/response.rb:41:in `read_status_line'
[...]
/home/git/gitlab-7.11.4/app/models/project_services/issue_tracker_service.rb:88:in `execute'
/home/git/gitlab-7.11.4/app/workers/project_service_worker.rb:8:in `perform'
[...]
```

See merge request !767
2015-06-15 14:01:10 +00:00
Sytse Sijbrandij 8f1eb7fed2 Prepare blog post in advance 2015-06-15 13:54:36 +00:00
Dmitriy Zaporozhets 7a7c6b469b Fix text align in last push event
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-15 14:54:41 +02:00
Dmitriy Zaporozhets 9522a710e5 Merge branch 'update_ssl_ciphers' into 'master'
Update ssl ciphers

Removing all DHE suites from Nginx template SSL ciphers.

This will deny forward secrecy for Android 2.3.7, Java 6 and OpenSSL 0.9.8. but will give A+ rating on SSL labs.

Google sites also do not have DHE suites, [source](https://community.qualys.com/blogs/securitylabs/2013/06/25/ssl-labs-deploying-forward-secrecy)

> Google's sites, for example, tend to not have any DHE suites in their configuration. [2013]

See merge request !814
2015-06-15 11:50:21 +00:00
Dmitriy Zaporozhets 7300729190 Merge branch 'rs-dev-issue-2228' into 'master'
Allow user to customize default Dashboard page

Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page:

> ![Screen_Shot_2015-06-11_at_11.12.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5282a3be7861d1148528c6bc9e7a0e0/Screen_Shot_2015-06-11_at_11.12.53_PM.png)

See merge request !778
2015-06-15 11:29:36 +00:00
Dmitriy Zaporozhets 9eec51d914 Move CHANGELOG item to 7.13 2015-06-15 11:28:50 +00:00
Marin Jankovski 86d35ed3d4 Update SSL ciphers per logjam vulnerability recommendations. 2015-06-15 11:40:00 +02:00
Marin Jankovski 168d5eabd4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-15 11:34:03 +02:00
Douwe Maan 646ce0aab5 Merge branch 'remove-visibility-icons' into 'master'
Remove visibility icon from projects list on dashboard and group page

## Why?

Because

* visibility level show on project page anyway
* it does not have much value. Main purpose of project list on dashboard is navigation. Avatar + project name helps this goal. Visibility icon have no effect here
* it makes UI worse because it brings separation between project avatar and name
* without visibility icon we have more space for project name. Especially important for laptops

## Screenshot

![Screenshot_2015-06-12_18.17.20](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0e572388e9a337c5a535813911d08c89/Screenshot_2015-06-12_18.17.20.png)

P.S. Merge when 7-12-stable is created

See merge request !806
2015-06-15 07:55:32 +00:00
Douwe Maan 6b96eb8e2c Merge branch 'remove_all_projects_button' into 'master'
Remove button to all projects on Trending Projects page.

Fixes #2001.

See merge request !1860
2015-06-15 07:51:40 +00:00
Douwe Maan 6617e9bbf3 Merge branch 'fix-post-receive-external-tracker' into 'master'
Fix post-receive errors on a push when an external issue tracker is configured

### What does this MR do?

This MR improves upon !766, fixing errors upon a git push that occur only when an external issue tracker (not JIRA) is used. This MR takes into account that external issue trackers, such as JIRA, may close issues. Disabling the processing of post-receive commits when an external issue tracker is configured seems like the wrong behavior.

### Why was this MR needed?

When a user adds an issue reference, the refactoring in 8f8a8ab and a6defd157 caused `project.get_issue` to be called, causing `ExternalIssue` to be returned when an external issue tracker was configured. This object does not have a `close` method, as needed in `CloseService`. Nor does it make sense to associate a `SystemNote` with this object.

GitLab EE uses a [special case for JIRA](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/services/git_push_service.rb#L87). I would recommend moving this logic into `CloseService` too.

### What are the relevant issue numbers?

* Closes #1700
* Closes #1720

See merge request !804
2015-06-15 07:42:24 +00:00
Robert Schilling 5890d3d5e6 Merge branch 'update-irker-home' into 'master'
Update Irker home page

[ci skip]

Closes #1713

See merge request !812
2015-06-15 07:22:09 +00:00
Robert Speicher c6b71111cc Fix doc typos 2015-06-15 00:39:13 -04:00
Robert Speicher b00f447db4 Add allowing_for_delay helper method for feature specs 2015-06-14 20:33:29 -04:00
Stan Hu b377ca0830 Update Irker home page
[ci skip]

Closes #1713
2015-06-14 15:52:55 -07:00
Nicolas 7b5b89eabd Remove button to all projects on Trending Projects page.
Fixes #2001.
2015-06-14 21:30:53 +02:00
Daniel Gerhardt 92bb845e1e Fix hooks for web based events with external issue references
The creation of cross references for external issues (which would fail)
is now prevented.

Fixes #1650, GH-9333.
2015-06-14 17:41:11 +02:00
Nicolas eccdbe367e Highlight Applications nav item when validation fails. 2015-06-14 17:35:03 +02:00
Dmitriy Zaporozhets 5c6d83b8e7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-14 12:46:22 +02:00
Dmitriy Zaporozhets b645f0f432 Merge pull request #9340 from jvanbaarsen/update-noteable
Update noteable after a new note is added
2015-06-14 12:46:07 +02:00
Dmitriy Zaporozhets 26f612505c Merge branch 'rs-issue-1432' into 'master'
Update Redcarpet to 3.3.0

Fixes #1432

See merge request !809
2015-06-14 10:42:25 +00:00
Dmitriy Zaporozhets ea636ebb7e Merge branch 'rs-expect-syntax-specs' into 'master'
Prepare specs for RSpec 3

See merge request !811
2015-06-14 10:42:00 +00:00
Robert Speicher 37066267e7 Use page.all and page.within in specs 2015-06-13 18:37:30 -04:00
Robert Speicher 422236c71e Change foo.should syntax to expect(foo).to in specs 2015-06-13 18:37:30 -04:00
Robert Speicher 75a40ad5bc Change foo.should_not syntax to expect(foo).not_to in specs 2015-06-13 18:19:24 -04:00
Robert Speicher 8ae13c7a51 Refactor RootController 2015-06-13 17:59:13 -04:00
Robert Speicher d2894a39e5 Refactor dashboard_choices 2015-06-13 17:59:13 -04:00
Robert Speicher c0cb77e413 Remove redundant help text from custom dashboard selection 2015-06-13 17:59:13 -04:00
Robert Speicher d0463d2c6a Fix alignment of Behavior form; add documentation link 2015-06-13 17:59:13 -04:00
Robert Speicher 13d9544d5d CHANGELOG for custom Dashboard page 2015-06-13 17:59:12 -04:00
Robert Speicher cdf893bc15 Move 2FA docs from "Workflow" to "Profile Settings" 2015-06-13 17:59:12 -04:00
Robert Speicher b9c85393c3 Add docs for Profile > Preferences
Also converts doc/README.md to Unix line endings
2015-06-13 17:59:12 -04:00
Robert Speicher 1562f017b6 Spec the failure cases for PreferencesController#update 2015-06-13 17:59:12 -04:00
Robert Speicher fb5271ddf1 Make the dashboard choice text match the text in the sidebar 2015-06-13 17:59:12 -04:00