Commit Graph
18656 Commits
Author SHA1 Message Date
Patricio Cano dd2ffafea4 Added spacing to icons in Notification drop down 2015-09-14 19:30:58 -05:00
Patricio Cano adcae6ebd5 Notification level can now be saved from within the project view. 2015-09-14 19:27:54 -05:00
Patricio Cano ab56718feb Fixed notification level list item helper. 2015-09-14 18:40:47 -05:00
Darby 84508c40b7 PAtrially working notification button 2015-09-14 16:37:11 -07:00
Robert Speicher a81ce718c7 Merge branch 'rouge-patch' into 'master'
Fix highlighting of deleted lines in diffs.

Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498

Only needed until https://github.com/jneen/rouge/pull/297 is merged into
Rouge and the gem is updated in GitLab.

Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an
option, since `gollum-lib` has `rouge` as a dependency, so it would get
included anyway, and which code we'd get would depend on the load order.

See merge request !1267
2015-09-09 18:37:45 +00:00
Kamil Trzciński 3b610d9821 Merge branch 'issue-1952' into 'master'
Fixed #1952 docker ssh connection times can be slow when UseDNS is enabled

See merge request !1208
2015-09-09 16:42:16 +00:00
Dmitriy Zaporozhets 1ba26b4d1b Merge branch 'redis-session-expire-delay' into 'master'
Fix reading session_expire_delay

The error occurs when application settings are not yet created and migrations are not yet done.

See merge request !1268
2015-09-09 16:28:01 +00:00
Douwe Maan 0d41b2dd87 Merge branch 'fix-emojis-relative-url' into 'master'
Fix emoji URLs in Markdown when relative_url_root is used

Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice.

Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:

RELATIVE_URL_ROOT=/gitlab rspec

Closes #1728

See merge request !1254
2015-09-09 14:53:14 +00:00
Kamil Trzcinski 0d66d4d342 Fix reading session_expire_delay when application settings are not yet created and migrations are not yet done 2015-09-09 15:31:40 +01:00
Douwe Maan d3730b0713 Fix highlighting of deleted lines in diffs. 2015-09-09 14:54:34 +01:00
Dmitriy Zaporozhets 0d610270d9 Merge branch 'ui-improvements' into 'master'
Fix UI bugs with discussions

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

See merge request !1265
2015-09-09 09:47:48 +00:00
Dmitriy Zaporozhets c9d78a00c5 Fix UI bugs with discussions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 11:36:55 +02:00
Dmitriy Zaporozhets 5ff84deb3a Merge branch 'nginx-git-http' into 'master'
Do not let NGINX buffer Git HTTP requests

Before this change NGINX would convert a chunked HTTP POST (e.g.
git push) into a HTTP 1.0 single large POST. This creates an
unnecessary delay, and it creates unnecessary memory pressure on
gitlab-git-http-server.

For the response ('proxy_buffering') I am less sure that NGINX 's
buffering behavior is harmful, but it still makes more sense to me
not to interfere with gitlab-git-http-server (and the Golang net/http
server).

See merge request !1256
2015-09-09 09:07:06 +00:00
Douwe Maan e8c8feb4b3 Merge branch 'add-meta-referrer-tag' into 'master'
Add meta tag for referrer

https://gitlab.zendesk.com/agent/tickets/7054

Added a meta referrer tag, so that only the origin is sent to third party sites, instead of the entire URL, thus avoiding the leak of sensitive information like password reset tokens.

/cc @DouweM

See merge request !1263
2015-09-09 08:59:26 +00:00
Dmitriy Zaporozhets b05cc8bc9a Merge branch 'global_labels' into 'master'
Global labels

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

See merge request !1240
2015-09-09 08:57:54 +00:00
Dmitriy Zaporozhets fbcde1aa77 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-09-09 09:20:48 +02:00
Stan Hu 349054e0ab Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-08 22:59:08 -07:00
Stan Hu 2b137f0875 Merge pull request #9538 from szechyjs/feature/fogbugz
Fogbugz importer
2015-09-08 22:58:24 -07:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Robert Speicher 1d5fe20ee2 Merge branch 'rs-bump-gitlab-shell' into 'master'
Bump gitlab-shell to v2.6.5

[ci skip]

See merge request !1264
2015-09-08 18:22:44 +00:00
Robert Speicher 4d6f8a6aee Bump gitlab-shell to v2.6.5 2015-09-08 13:34:07 -04:00
Patricio Cano 983a102bd0 Added meta tag for referrer, so that only the origin is sent to third party sites, instead of the entire URL, thus avoiding the leak of sensitive information like password reset tokens. 2015-09-08 12:28:28 -05:00
Robert Speicher df1f4433c5 Merge branch 'mr-xss' into 'master'
Escape user-provided content in preserved HAML sections

See merge request !1927
2015-09-08 17:17:37 +00:00
Dmitriy Zaporozhets 86556a079e Improve diff UI and mr compare page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 17:22:26 +02:00
Dmitriy Zaporozhets e9cf79da2f Style merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 16:42:18 +02:00
Dmitriy Zaporozhets 4651155881 Make system note different from regular comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 16:11:41 +02:00
Dmitriy Zaporozhets 70aecc34cf Improve commit page style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 15:40:14 +02:00
Dmitriy Zaporozhets 2fde90a2c2 Fix small font size for diff comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 15:35:25 +02:00
Dmitriy Zaporozhets 99bbbb5c30 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-08 15:04:22 +02:00
Dmitriy Zaporozhets 7fe6d11a3d Move group member title to header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 15:02:51 +02:00
Douwe Maan 9f31f95ada Escape user-provided content in preserved HAML sections 2015-09-08 11:18:55 +01:00
Dmitriy Zaporozhets 4ac9dcc2d2 Merge branch 'issue-redesign' into 'master'
Issue redesign

* new issue UI
* fixed small font in issue/mr list

See merge request !1258
2015-09-08 09:45:07 +00:00
Dmitriy Zaporozhets 925d392682 Make comment form bigger
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 11:21:33 +02:00
Dmitriy Zaporozhets 1e1376f230 Style milestones
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 11:14:48 +02:00
Dmitriy Zaporozhets 0250bab8e9 Style wiki pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 10:23:09 +02:00
Dmitriy Zaporozhets 4bea030c88 Style system notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 10:12:14 +02:00
Dmitriy Zaporozhets def4d8b906 Improve issue/mr title and description styles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 09:58:43 +02:00
Dmitriy Zaporozhets 1240a7e065 Improve font size on issues/mr list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 09:32:06 +02:00
Dmitriy Zaporozhets 31fc6b26d8 Style comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 01:47:36 +02:00
Dmitriy Zaporozhets 6887075b2e Style issue page, comments and part of merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 01:25:51 +02:00
Dmitriy Zaporozhets 243bfc975e Small restyle of issue and merge request pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 22:04:23 +02:00
Dmitriy Zaporozhets e0da2c3523 Merge branch 'ui-improvements' into 'master'
Ui improvements

* fix project home page when activity set as default
* style commits, branches and tags pages to new style
* render flash message outside of content block
* style group pages

See merge request !1255
2015-09-07 14:17:00 +00:00
Jacob Vosmaer 783791fd08 The good stuff needs NGINX 1.7.11 2015-09-07 14:59:32 +02:00
Dmitriy Zaporozhets 2b31989582 Fix compare tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 14:55:42 +02:00
Valery Sizov 954dd7ce87 Merge branch 'crowd' into 'master'
Crowd integration

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

See merge request !1228
2015-09-07 11:20:03 +00:00
Dmitriy Zaporozhets 700a342e0d Restyle group pages. Merge header with page title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 13:18:11 +02:00
Jacob Vosmaer 8d59b1ac45 Do not let NGINX buffer Git HTTP requests
Before this change NGINX would convert a chunked HTTP POST (e.g.
git push) into a HTTP 1.0 single large POST. This creates an
unnecessary delay, and it creates unnecessary memory pressure on
gitlab-git-http-server.

For the response ('proxy_buffering') I am less sure that NGINX 's
buffering behavior is harmful, but it still makes more sense to me
not to interfere with gitlab-git-http-server (and the Golang net/http
server).
2015-09-07 13:05:29 +02:00
Dmitriy Zaporozhets dad163b7ee Style project milestones page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 12:52:53 +02:00
Dmitriy Zaporozhets 183562bc35 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 12:45:06 +02:00
Valery Sizov 9836017c70 satisfy rubocop 2015-09-07 13:15:27 +03:00