Commit Graph
8955 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
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
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 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
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 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
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 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
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 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
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 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
Robert Speicher bf9dd4327e Add feature specs for default dashboard preference 2015-06-13 17:59:12 -04:00
Robert Speicher 1eb9a02f21 Add a form field to customize the dashboard preference 2015-06-13 17:59:11 -04:00
Robert Speicher 6de3958364 Account for RootController for dashboard navigation and Dispatch JS 2015-06-13 17:59:11 -04:00
Robert Speicher 94d3c1433d Add RootController
This controller is now the target for `root_url`. It sub-classes
DashboardController so we can render the old default without a redirect
if the user hasn't customized their dashboard location.
2015-06-13 17:59:11 -04:00
Robert Speicher 2bc4fd2d04 Add dashboard attribute to User model 2015-06-13 17:59:11 -04:00
Robert Speicher 35339bb11f Update markup/styling for syntax highlight theme preference 2015-06-13 17:58:17 -04:00
Robert Speicher 0e21436aaf Simplify the javascript behavior for Preference updating 2015-06-13 17:58:17 -04:00
Robert Speicher 5f20574db5 Fix a few remaining references to the old Theme names/IDs 2015-06-13 17:58:17 -04:00
Robert Speicher 1044dfbfd2 Remove js handler from Profiles#update
It was only used for the appearance live updating, which is now handled
by Profiles::Preferences#update
2015-06-13 17:58:16 -04:00
Robert Speicher 8112f7550b Add PreferencesHelper module
Consolidates the helpers related to user preferences.

Renames `app_theme` to `user_application_theme` to better explain what
it is.
2015-06-13 17:58:16 -04:00
Robert Speicher 844d72716e Add Gitlab::Themes module; remove Gitlab::Theme
Now we can simply loop through all themes, among other things.

This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
2015-06-13 17:58:16 -04:00
Robert Speicher 658b42b1fa Consolidate theme stylesheets into one
Since they're all defined by a mixin, it didn't provide any benefit to
have them in separate files.

This also adds variables defining the basic color of each theme so we
can re-use them in the previews.
2015-06-13 17:58:16 -04:00
Robert Speicher 0c0c31ff34 Move the "Design" templates and logic to Preferences 2015-06-13 17:58:16 -04:00
Robert Speicher 821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04:00
Robert Speicher 567a25b630 Ensure session_expire_delay field exists before accessing it
Closes #1798
2015-06-13 00:31:08 -04:00
Dmitriy Zaporozhets 0a03b9b717 Remove visibility icon from projects list on dashboard and group page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-12 18:16:19 +02:00
Stan Hu d45112258e Fix post-receive errors on a push when an external issue tracker is configured
Closes #1700
Closes #1720
2015-06-12 06:59:27 -07:00
Douwe Maan 9ea8dcb5e2 Merge branch 'feature-session-expire-seconds-ui' into 'master'
Add session expiration delay configuration through UI application

Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting)

Answers the following suggestions:

  * http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable
  * http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle

See merge request !774
2015-06-12 13:50:40 +00:00
Douwe Maan e9c40a9c0f Merge branch 'fix_typo_account_page' into 'master'
Fix typo on account page.

@douwe Thanks for reviewing this small fix.

See merge request !1854
2015-06-12 13:16:31 +00:00
Dmitriy Zaporozhets f92d6e2423 Merge branch 'remove-activity-feed-text' into 'master'
Remove text since rss is now to prominent.

See merge request !1855
2015-06-12 10:41:50 +00:00
Sytse Sijbrandij 91ab3849bd Remove text since rss is now to prominent. 2015-06-12 11:58:18 +02:00
Dmitriy Zaporozhets 21a62bb995 Merge branch 'refactor-mr-widget' into 'master'
Refactor accept merge request widget

* make each case a simple view
* separate  merge request JS from merge request accept widget JS

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

See merge request !799
2015-06-12 08:22:13 +00:00
Dmitriy Zaporozhets 5cacc06508 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-12 10:12:43 +02:00
Dmitriy Zaporozhets b63ef1a077 Merge branch 'fix-graph-width' into 'master'
Fix graph width on different screen sizes

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

See merge request !802
2015-06-12 08:11:47 +00:00
Dmitriy Zaporozhets b4c02311b7 Merge branch 'fluid-commit-calendar' into 'master'
Make commit calendar size depend on window size

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

See merge request !801
2015-06-12 07:30:45 +00:00
Nicolas c2087098be Fix typo on account page. 2015-06-12 05:15:11 +02:00
Dmitriy Zaporozhets 4e98159022 Merge branch 'rs-issue-1757' into 'master'
Add negative tabindex to Markdown Write and Preview tabs

Closes #1757

See merge request !796
2015-06-11 21:17:35 +00:00
Dmitriy Zaporozhets c69ca9912e Merge pull request #9371 from zenati/patch-2
An `in_namespace` scope is already present
2015-06-11 23:09:41 +02:00
Dmitriy Zaporozhets aa38dfe938 Fix graph width on different screen sizes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 23:00:38 +02:00