Commit Graph
22224 Commits
Author SHA1 Message Date
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
Robert Speicher 2d72efcd9f Add count to Themes and ColorSchemes 2015-08-26 11:30:38 -07:00
Robert Speicher 6d43308b5a Add Gitlab::Themes.for_user 2015-08-26 11:30:11 -07:00
Douwe Maan f197785495 Use sudu -u git where appropriate 2015-08-26 10:13:11 -07:00
Robert Speicher de3b7d9c52 Merge branch 'update-mail-room' into 'master'
Update mail_room

See merge request !1213
2015-08-26 16:23:51 +00:00
Douwe Maan d0420c68fb Simplify doc 2015-08-26 09:23:25 -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
Douwe Maan bc683a5904 Update mail_room 2015-08-26 08:58:46 -07:00
Robert Speicher 5b93c5579f Merge branch 'update-changelog-for-7.14.1' into 'master'
Update CHANGELOG for released 7.14.1

[ci skip]

See merge request !1211
2015-08-26 15:52:20 +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 6c23fd389f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-26 17:06:32 +02: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 5ea15fc7b5 Update CHANGELOG for released 7.14.1
[ci skip]
2015-08-26 07:53:48 -07: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 626c6f9730 Merge branch 'blame_fix' into 'master'
Improve perofrmance of git blame

https://gitlab.com/gitlab-org/gitlab-ce/issues/2286

Now, it's four times as faster.

See merge request !1209
2015-08-26 14:19:53 +00: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
Job van der Voort 7bcce28df6 Merge branch 'fix' into 'master'
Fixed text about HTTP

Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840

See merge request !1921
2015-08-26 11:16:13 +00:00
Rowan Wookey 3655e433dd Fixed #1952 docker ssh connection times can be slow when UseDNS is enabled 2015-08-26 12:12:43 +01: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
Dmitriy Zaporozhets 735978388f Increase width of sidebar for several pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 10:36:08 +02:00
Dmitriy Zaporozhets 5ddf38e188 Improve project name/description look on project page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 10:21:51 +02:00
karen Carias 4d0423cd9f New doc about how to create an issue 2015-08-25 22:15:02 -07:00
karen Carias bff8376ab1 added new commands 2015-08-25 21:58:40 -07:00
karen Carias 9d40457766 added new commands 2015-08-25 21:57:10 -07:00
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Robert Speicher d6a145d4b0 Fix two more failing specs 2015-08-25 16:26:20 -07:00
Robert Speicher c401543d02 Fix failing spec 2015-08-25 15:57:55 -07:00
Robert Speicher 2c3e42e4a4 Remove user_color_scheme_class
Instead of rendering this value server-side, we use Javascript and Gon
to apply the user's color scheme (or the default) to any syntax
highlighted code blocks.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
2015-08-25 15:32:38 -07:00
Robert Speicher 59180c4f5a Add highlight_word style definition to each color scheme
Now we don't need to override the user color scheme on search results.
They'll look good with any of them.
2015-08-25 15:32:38 -07:00
Robert Speicher 4344b8d2d4 Add Gitlab::ColorSchemes module
Very similar to Gitlab::Theme, this contains all of the definitions for
our syntax highlighting schemes.
2015-08-25 15:32:38 -07:00
Douwe Maan 9ae12c3981 No mailbox_command needed 2015-08-25 12:29:11 -07:00
Robert Speicher 068dcefc86 Merge branch 'fix-reply-by-email-init' into 'master'
Fix init script for Reply by email

See merge request !1202
2015-08-25 19:22:02 +00:00
Douwe Maan 5c226d335f No DNS setup necessary, but firewall setup may be. 2015-08-25 12:21:54 -07:00
Douwe Maan 02e7b00a54 Fix init script for Reply by email 2015-08-25 12:03:58 -07:00
Douwe Maan 5747fa0016 Fix docs 2015-08-25 12:03:31 -07:00