Commit Graph
9174 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1c3c3ba512 Merge branch 'ui-improvements' into 'master'
UI improvements

* Convert forked from button to text
* Refactor md variables
* Improve project fork page
* Style blob show page
* Style syntax highlight area for white theme

See merge request !1273
2015-09-10 12:34:24 +00:00
Dmitriy Zaporozhets 059b8828d3 Style syntax highlight area for white theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:36:42 +02:00
Dmitriy Zaporozhets b08c5521f5 Style blob show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:25:09 +02:00
Dmitriy Zaporozhets df51b029ab Improve project fork page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:14:25 +02:00
Dmitriy Zaporozhets 6933da1ee0 Refactor md variables
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 12:38:07 +02:00
Dmitriy Zaporozhets 86ef2eb728 Conver forked from button to text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 12:35:37 +02:00
Dmitriy Zaporozhets dadf6daac4 Merge branch 'disable-issue-autofill' into 'master'
Turned off autocomplete for new issue titles

See merge request !1271
2015-09-10 10:17:53 +00:00
Dmitriy Zaporozhets af3b6f6362 Fix fixed layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 09:52:02 +02:00
Dmitriy Zaporozhets a0359fbd77 Improve accounts page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 00:34:09 +02:00
Darby def939a562 Turned off autocomplete for new issue titles 2015-09-09 15:04:38 -07:00
Dmitriy Zaporozhets 960a1880ab Fix last element of sidebar being hidden for small screens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:49:34 +02:00
Dmitriy Zaporozhets 12ad9b4ba0 Enable blank container for group settings page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:38:27 +02:00
Dmitriy Zaporozhets 10b6a92481 Style panels and add blank container
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:29:19 +02:00
Dmitriy Zaporozhets 1e3ce07714 Use page title for header title too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:05:47 +02:00
Dmitriy Zaporozhets fa40759768 Separate profile settings link from the rest on sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 22:36:13 +02: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
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
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -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 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 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
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
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 0fbd6244ec Merge branch 'annotate-models' into 'master'
Re-annotate models

See merge request !1253
2015-09-07 09:58:51 +00:00
Dmitriy Zaporozhets 11f815ac1e Render flash message out of content block 2015-09-07 11:58:19 +02:00
Dmitriy Zaporozhets aa6d29f0a7 Style commits, branches and tags pages to match new UI 2015-09-07 11:44:00 +02:00
Douwe Maan 662cf2cef4 Merge branch 'fix-wiki-page-history' into 'master'
Fix broken Wiki Page History

This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.

Closes #2104

Closes #1751

Closes #1592

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

See merge request !1232
2015-09-07 09:27:48 +00:00
Douwe Maan b9df499860 Merge branch 'rs-dev-issue-2466' into 'master'
Remove style attribute from textarea during ZenMode activation

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466

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

See merge request !1248
2015-09-07 09:20:00 +00:00
Dmitriy Zaporozhets 6c1d5c5c9c Fix project page with activity as default home page 2015-09-07 11:10:40 +02:00
Stan Hu d7812a95cf Re-annotate models 2015-09-06 07:48:48 -07:00