Commit Graph
9079 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 5bbe6c4d54 Split starred projects list and activity in same way like we did with your projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 19:17:04 +02:00
Dmitriy Zaporozhets 28219ea921 Merge branch 'fix-raw-controller-disposition' into 'master'
Remove the filename argument from Content-Disposition header

This MR removes the filename argument from the `Content-Disposition` header to avoid RFC 5987 and RFC 6266 encoding issues. Some browsers (e.g. Internet Explorer) do not properly decode a Unicode string properly, and this can lead to odd filenames in the raw file download. This change allows the browser to determine the filename based on the URL.

For example, if I have a file called `한글한글.pptx` and click to download it with the "Raw" button in the Files section, IE11 will ask:

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

If you look at the `Content-Disposition` field, you see this:

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

Chrome, Firefox, and Safari seem to be able to handle UTF-8 encoded filenames, even though this is not standard.

See: http://greenbytes.de/tech/tc2231/

Closes https://github.com/gitlabhq/gitlabhq/issues/9595

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829

I've also submitted a pull request to Rails to support RFC 6266: https://github.com/rails/rails/pull/21461

See merge request !1235
2015-09-02 12:25:28 +00:00
Stan Hu 551157960e Remove the filename argument from Content-Disposition header to avoid
RFC 5987 and RFC 6266 encoding issues. This change allows the browser
to determine the filename based on the URL.

See: http://greenbytes.de/tech/tc2231/

Closes https://github.com/gitlabhq/gitlabhq/issues/9595

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
2015-09-02 00:20:05 -07:00
Kirilll Zaitsev 263abda3fd Drone CI service 2015-09-02 05:52:16 +03:00
Douwe Maan afb2e6f485 Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'
Decouple Gitlab::Markdown from the GitlabMarkdownHelper

This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).

See merge request !1223
2015-09-01 20:13:44 +00:00
Robert Speicher 1bcfe4d2ff Remove PreferencesHelper include from GitlabMarkdownHelper 2015-09-01 13:37:05 -04:00
Dmitriy Zaporozhets f07273f6f6 Rename profile settings navigation to "Profile Settings"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-01 13:35:03 +02:00
Valery Sizov bb86df1bd2 Merge branch 'fix-branches-cache-after-merge' into 'master'
Expire cache when merge request source branch was removed

Re-implement !1160 for 8.0. Also we have tests for MergeWorker now! Yay 

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

See merge request !1224
2015-09-01 09:09:03 +00:00
Robert Speicher 2930041886 Make sure the gfm helper passes the required options
This adds some duplication, but this helper is temporary.
2015-08-31 18:09:18 -04:00
Robert Speicher 90ab92621f Make gfm delegate to Gitlab::Markdown.gfm instead of markdown
Some usages of the `gfm` helper depend on the text not being rendered as
standard Markdown. Ugh.
2015-08-31 16:16:26 -04:00
Robert Speicher 7816b22360 Fix context options in markdown helper
We need to send `path`, not `requested_path`.
2015-08-31 16:16:03 -04:00
Dmitriy Zaporozhets c767e2e0fd Merge branch 'fix-headers-blocking-anchors' into 'master'
Prevent anchors from being hidden by header upon a new page load

Browsers change the scroll position after the page is loaded, and the current 1 ms
delay wasn't long enough for the browser to jump to the anchor. Even then, it appears
another 100ms delay is necessary to adjust the scroll properly:

http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict

Add a little more of an offset to see a few lines before the anchor.

* Closes #1614
* Closes #1024

See merge request !1225
2015-08-31 17:11:41 +00:00
Robert Speicher 8c0565b7ca Merge branch 'dont-notify-users-without-project-access' into 'master'
Don't notify users without access to the project when they are (accidentally) mentioned in a note.

Addresses #2366.

See merge request !1216
2015-08-30 23:56:34 +00:00
Douwe Maan fe86c8dfbd Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 2015-08-29 11:49:14 -07:00
Stan Hu 1fdf56c95d Prevent anchors from being hidden by header upon a new page load.
Browsers change the scroll position after the page is loaded, and the current 1 ms
delay wasn't long enough for the browser to jump to the anchor. Even then, it appears
another 100ms delay is necessary to adjust the scroll properly:

http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict

Add a little more of an offset to see a few lines before the anchor.

Closes #1614
Closes #1024
2015-08-29 02:05:37 -07:00
Dmitriy Zaporozhets 39ee52f1b1 Expire cache when merge request source branch was removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-28 10:23:56 +02:00
Robert Speicher 62117becb9 Add a temporary gfm helper that just delegates to markdown
Some views are still calling `gfm` directly. We'll need to update them
to instead call `markdown` with a `pipeline: ...` argument.
2015-08-27 15:36:56 -07:00
Dmitriy Zaporozhets 53698401fb Merge branch 'make_all_profile_public' into 'master'
Make all profile public

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

See merge request !1219
2015-08-27 21:55:00 +00:00
Robert Speicher a4e4fde3e6 Restore the forwarded HTML options in link_to_gfm 2015-08-27 14:28:45 -07:00
Robert Speicher 4340dd3eeb Decouple Gitlab::Markdown from the GitlabMarkdownHelper
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
2015-08-27 14:17:26 -07:00
Douwe Maan 30555c1d24 Merge branch 'rs-remove-user-color-scheme-class' into 'master'
Apply syntax highlighting to fenced code blocks client-side

Instead of applying the syntax highlighting scheme class to these blocks
server-side, we use Javascript and Gon to apply the user's color scheme
(or the default) client-side.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.

See merge request !1203
2015-08-27 16:24:51 +00:00
Valery Sizov ff30b40754 Make all profile public 2015-08-27 13:06:14 +03:00
Dmitriy Zaporozhets abb5b9f6e5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-27 10:16:17 +02:00
Dmitriy Zaporozhets 8cc47bbf3c Merge branch 'ui-improvements' into 'master'
UI improvements

* use shared partials for repeating rendering of projects, groups, snippets etc
* more consistency in way how projects, snippets and groups lists are rendered
* fix 500 error when submit project snippet without body
* remove some old and unused css
* more compact search page

See merge request !1214
2015-08-27 08:09:53 +00:00
Sytse Sijbrandij 397ebc5fc1 Doesn't refer to participating in watch. 2015-08-26 19:29:37 -07:00
Douwe Maan ea5da30326 Don't notify users without access to the project when they are (accidentally) mentioned in a note. 2015-08-26 17:23:22 -07:00
Dmitriy Zaporozhets e06fe6b7e1 Make search bar on search page more noticeable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:50:17 +02:00
Dmitriy Zaporozhets dcdf214fd1 More compact search page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:22:36 +02:00
Dmitriy Zaporozhets 3d02ead924 Use same snippets icon everywhere. Fix list style for bordered-list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:06:48 +02:00
Dmitriy Zaporozhets 4ac7f5c949 Restyle snippets rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:00:06 +02:00
Dmitriy Zaporozhets daa90e1182 Fix 500 error when try to create project snippet without content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 23:59:52 +02:00
Dmitriy Zaporozhets 5ea5e8f5d6 Standartize how we render group rows
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 23:41:56 +02:00
Dmitriy Zaporozhets e0b4222fa6 Small improvements to center top menu
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 23:12:24 +02:00
Dmitriy Zaporozhets 174e4424a5 Remove unused css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 22:52:52 +02:00
Dmitriy Zaporozhets b54358b457 Refactor project list rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 22:44:02 +02:00
Dmitriy Zaporozhets c27c813311 Improve trending projects finder
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 22:43:04 +02:00
Robert Speicher ce0a0feff4 Make snippet_blob highlight server-side as well 2015-08-26 11:43:25 -07:00
Robert Speicher 54771100eb Add user_color_scheme class to file_highlight
Prevents an unstyled flash that occurs when we were only applying the
syntax highlighting class in Javascript. Now for these uncached blobs
the server can add the syntax class, and for (possibly) cached fenced
code blocks, the Javascript will add it as needed.
2015-08-26 11:34:28 -07:00
Robert Speicher 7a81dc65d9 Re-add user_color_scheme helper
Update PreferencesHelper specs
2015-08-26 11:33:44 -07:00
Dmitriy Zaporozhets ef0149dd44 Merge branch 'enable_ssl_verification_web_hook' into 'master'
Enable SSL verification for Webhooks

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

See merge request !1135
2015-08-26 16:06:02 +00:00
Dmitriy Zaporozhets fc66e1cc94 Merge branch 'prevent-too-many-redirects-on-signin' into 'master'
Prevent too many redirects error when home page URL set to external_urll

Many users naively set the home page URL setting to external_url
(e.g. https://mydomain.com). When an unauthenticated user signs in, this
causes endless redirections. For example, this is occuring:

1. Unauthenticated user attempts to access https://mydomain.com/dashboard
2. Application redirects to the home page URL: https://mydomain.com
3. Repeat step 2

In step 3, ApplicationController should have redirected the user to
https://mydomain.com/users/sign_in. Disabling the redirection if home
page URL is the same as external_url prevents users from messing up.

* Closes https://github.com/gitlabhq/gitlabhq/issues/8843
* Closes #2057

See merge request !1210
2015-08-26 15:23:53 +00:00
Dmitriy Zaporozhets ef1776b823 Merge branch 'fluid-fixed-layout' into 'master'
Limit content width for big screens except certain pages

- [x] limit content width to 1200px
- [x] align header with head
- [x] set full-width for split diff pages

Fixes #2353

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

See merge request !1207
2015-08-26 14:56:04 +00:00
Stan Hu c1fe98e0b9 Prevent too many redirects error when home page URL set to external_urll
Many users naively set the home page URL setting to external_url
(e.g. https://mydomain.com). When an unauthenticated user signs in, this
causes endless redirections. For example, this is occuring:

1. Unauthenticated user attempts to access https://mydomain.com/dashboard
2. Application redirects to the home page URL: https://mydomain.com
3. Repeat step 2

In step 3, ApplicationController should have redirected the user to
https://mydomain.com/users/sign_in. Disabling the redirection if home
page URL is the same as external_url prevents users from messing up.

Closes https://github.com/gitlabhq/gitlabhq/issues/8843
Closes #2057
2015-08-26 07:38:33 -07:00
Dmitriy Zaporozhets 468d29251d Fix header for anonymous users too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 16:00:37 +02:00
Valery Sizov 99b2be7625 Improve perofrmance of git blame 2015-08-26 16:39:55 +03:00
Valery Sizov bafffb2d14 Enable SSL verification for Webhooks 2015-08-26 15:48:31 +03:00
Dmitriy Zaporozhets 2fa560d658 Align header with content container
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 13:16:43 +02:00
Dmitriy Zaporozhets bc03dfe774 Merge branch 'bar-graphs' into 'master'
Change plots to bar graphs

Since line plot does not make sense for this kind of plots, change them to bar graphs. Bar graphs are easier to read and they look cool too.

I would like to change commits per author plots to bar graphs too, but code looks too messy to modify.

See merge request !645
2015-08-26 10:25:59 +00:00
Dmitriy Zaporozhets 0276e9032a Limit content width for big screens except certain pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 11:51:28 +02:00
Dmitriy Zaporozhets de9f348dfa Merge branch 'ui-improvements' into 'master'
Ui improvements

* Improve project name/description look on project page
* Increase width of sidebar for several pages

See merge request !1206
2015-08-26 09:16:39 +00:00