Commits · 903132bc079970787333347209f6baebdd48800f · Jérome Perrin / gitlab-ce

16 Jun, 2015 1 commit

Merge branch 'fix-ext-issue-webbased-hooks' into 'master' · 903132bc

Douwe Maan authored Jun 16, 2015

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
8f8a8ab3. 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

903132bc

15 Jun, 2015 18 commits

Merge branch 'fix-gitlab-ci-yml' into 'master' · 5fa02489

Dmitriy Zaporozhets authored Jun 15, 2015

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

5fa02489

Look for .gitlab-ci.yml only if checkout_sha is present · 0674bf23
Dmitriy Zaporozhets authored Jun 15, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
0674bf23
Dont set checkout sha for removed branch/tag · fe51fa26
Dmitriy Zaporozhets authored Jun 15, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
fe51fa26

Merge branch 'blog-post-in-advance' into 'master' · cbba28bd

Job van der Voort authored Jun 15, 2015

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

cbba28bd

Merge branch 'fix-ext-issue-tracker-hook' into 'master' · 6c7131b4

Dmitriy Zaporozhets authored Jun 15, 2015

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

6c7131b4

Prepare blog post in advance · 8f1eb7fe
Sytse Sijbrandij authored Jun 15, 2015

8f1eb7fe
Fix text align in last push event · 7a7c6b46
Dmitriy Zaporozhets authored Jun 15, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7a7c6b46

Merge branch 'update_ssl_ciphers' into 'master' · 9522a710

Dmitriy Zaporozhets authored Jun 15, 2015

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

9522a710

Merge branch 'rs-dev-issue-2228' into 'master' · 73007291

Dmitriy Zaporozhets authored Jun 15, 2015

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

73007291

Move CHANGELOG item to 7.13 · 9eec51d9
Dmitriy Zaporozhets authored Jun 15, 2015

9eec51d9
Update SSL ciphers per logjam vulnerability recommendations. · 86d35ed3
Marin Jankovski authored Jun 15, 2015

86d35ed3
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 168d5eab
Marin Jankovski authored Jun 15, 2015

168d5eab

Merge branch 'remove-visibility-icons' into 'master' · 646ce0aa

Douwe Maan authored Jun 15, 2015

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

646ce0aa

Merge branch 'remove_all_projects_button' into 'master' · 6b96eb8e
Douwe Maan authored Jun 15, 2015
```
Remove button to all projects on Trending Projects page.

Fixes #2001.

See merge request !1860
```
6b96eb8e

Merge branch 'fix-post-receive-external-tracker' into 'master' · 6617e9bb

Douwe Maan authored Jun 15, 2015

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 8f8a8ab3 and a6defd15 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

6617e9bb

Merge branch 'update-irker-home' into 'master' · 5890d3d5
Robert Schilling authored Jun 15, 2015
```
Update Irker home page

[ci skip]

Closes #1713

See merge request !812
```
5890d3d5
Fix doc typos · c6b71111
Robert Speicher authored Jun 15, 2015

c6b71111
Add `allowing_for_delay` helper method for feature specs · b00f447d
Robert Speicher authored Jun 14, 2015

b00f447d

14 Jun, 2015 7 commits
- Update Irker home page · b377ca08
  Stan Hu authored Jun 14, 2015
```
[ci skip]

Closes #1713
```
  b377ca08
- Remove button to all projects on Trending Projects page. · 7b5b89ea
  Nicolas authored Jun 14, 2015
```
Fixes #2001.
```
  7b5b89ea
- Fix hooks for web based events with external issue references · 92bb845e
  Daniel Gerhardt authored Jun 14, 2015
```
The creation of cross references for external issues (which would fail)
is now prevented.

Fixes #1650, GH-9333.
```
  92bb845e
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 5c6d83b8
  Dmitriy Zaporozhets authored Jun 14, 2015
  
  5c6d83b8
- Merge pull request #9340 from jvanbaarsen/update-noteable · b645f0f4
  Dmitriy Zaporozhets authored Jun 14, 2015
```
Update noteable after a new note is added
```
  b645f0f4
- Merge branch 'rs-issue-1432' into 'master' · 26f61250
  Dmitriy Zaporozhets authored Jun 14, 2015
```
Update Redcarpet to 3.3.0

Fixes #1432

See merge request !809
```
  26f61250
- Merge branch 'rs-expect-syntax-specs' into 'master' · ea636ebb
  Dmitriy Zaporozhets authored Jun 14, 2015
```
Prepare specs for RSpec 3

See merge request !811
```
  ea636ebb
13 Jun, 2015 14 commits
- Use `page.all` and `page.within` in specs · 37066267
  Robert Speicher authored Jun 13, 2015
  
  37066267
- Change `foo.should` syntax to `expect(foo).to` in specs · 422236c7
  Robert Speicher authored Jun 13, 2015
  
  422236c7
- Change `foo.should_not` syntax to `expect(foo).not_to` in specs · 75a40ad5
  Robert Speicher authored Jun 13, 2015
  
  75a40ad5
- Refactor RootController · 8ae13c7a
  Robert Speicher authored Jun 12, 2015
  
  8ae13c7a
- Refactor dashboard_choices · d2894a39
  Robert Speicher authored Jun 12, 2015
  
  d2894a39
- Remove redundant help text from custom dashboard selection · c0cb77e4
  Robert Speicher authored Jun 12, 2015
  
  c0cb77e4
- Fix alignment of Behavior form; add documentation link · d0463d2c
  Robert Speicher authored Jun 11, 2015
  
  d0463d2c
- CHANGELOG for custom Dashboard page · 13d9544d
  Robert Speicher authored Jun 10, 2015
  
  13d9544d
- Move 2FA docs from "Workflow" to "Profile Settings" · cdf893bc
  Robert Speicher authored Jun 11, 2015
  
  cdf893bc
- Add docs for Profile > Preferences · b9c85393
  Robert Speicher authored Jun 10, 2015
```
Also converts doc/README.md to Unix line endings
```
  b9c85393
- Spec the failure cases for PreferencesController#update · 1562f017
  Robert Speicher authored Jun 10, 2015
  
  1562f017
- Make the dashboard choice text match the text in the sidebar · fb5271dd
  Robert Speicher authored Jun 10, 2015
  
  fb5271dd
- Add feature specs for default dashboard preference · bf9dd432
  Robert Speicher authored Jun 10, 2015
  
  bf9dd432
- Add a form field to customize the dashboard preference · 1eb9a02f
  Robert Speicher authored Jun 10, 2015
  
  1eb9a02f