Commit Graph

18679 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets cf36509a34
Style dashboard milestones page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 15:00:50 +02:00
Dmitriy Zaporozhets 0362a0f0d7
Fix stars align
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 14:57:11 +02:00
Dmitriy Zaporozhets 8b5a14fd0a
Fix failing test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 14:53:25 +02:00
Dmitriy Zaporozhets 8301836b42
Small ui improvements to activity feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:56:32 +02:00
Dmitriy Zaporozhets af6f739f35
Fix fonts for assets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:40:15 +02:00
Dmitriy Zaporozhets dc86a91979
Event feed use gl-padding var
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:31:48 +02:00
Dmitriy Zaporozhets 20647f0306 Merge branch 'ui-improvements' 2015-09-04 11:27:49 +02:00
Dmitriy Zaporozhets c13ef89862
Make UI more compact
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:17:25 +02:00
Dmitriy Zaporozhets 16e6913e00
Add awesome font SourceSansPro
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:17:07 +02:00
Douwe Maan f92b1cb0ff Merge branch 'fix-services-doc-generation' into 'master'
Fix `rake services:doc` generation

From: https://github.com/gitlabhq/gitlabhq/pull/9604#issuecomment-137539926

See merge request !1243
2015-09-04 08:18:00 +00:00
pilsner 4144c59941 add Content-Type header of raw image file
Add Content-Type header to fix a bug which IE can't show image in
markdown when the image is from raw.

	modified:   CHANGELOG
	modified:   app/controllers/projects/raw_controller.rb
	modified:   spec/controllers/projects/raw_controller_spec.rb
2015-09-04 13:06:02 +09:00
Stan Hu a73044320f Fix `rake services:doc` generation
[ci skip]
2015-09-03 20:54:16 +00:00
Dmitriy Zaporozhets 996f51559b Merge branch 'ui-improvements' into 'master'
Ui improvements

* show page context title instead of `Dashboard` keyword
* fix event feed overflow
* remove annoying tooltips where its not needed
* fix tests broken in previous mr

See merge request !1242
2015-09-03 20:29:54 +00:00
Dmitriy Zaporozhets 858675ff8a
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 22:25:52 +02:00
Dmitriy Zaporozhets c2a9e6ea67
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 22:15:21 +02:00
Dmitriy Zaporozhets 0145e8ea21
Set page title based on content in dashboard area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 21:53:55 +02:00
Dmitriy Zaporozhets b008273883
Fix even feed title overflow
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 21:36:03 +02:00
Dmitriy Zaporozhets d0a580273a
Replace obvious tooltips. Fix line-height for top nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 19:41:06 +02:00
Dmitriy Zaporozhets ce9cb516a1
Fix tab toggle on activity
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 19:27:13 +02:00
Dmitriy Zaporozhets d44f697419 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-03 19:15:37 +02:00
Dmitriy Zaporozhets ae7fd8b2f1 Merge branch 'ui-improvements' into 'master'
Collection of fixes and improvements to GitLab UI

* new design colors
* new font size
* change padding and size of form inputs
* new activity page
* new groups page
* new explore projects page

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

cc @skyruler

See merge request !1239
2015-09-03 17:15:03 +00:00
Dmitriy Zaporozhets 211e775039
Improve explore proojects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 19:08:43 +02:00
Dmitriy Zaporozhets b7427faa49
Improve starred and trending pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 19:07:23 +02:00
Dmitriy Zaporozhets 1c8ec154a9
Refactor colors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 18:48:35 +02:00
Dmitriy Zaporozhets 89df4a7922
New UI for explore groups and trending pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 18:19:31 +02:00
Valery Sizov 6bd3d72bbd added spinach for glabal labels 2015-09-03 19:02:14 +03:00
Dmitriy Zaporozhets 0195b085a1
Style groups page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 17:21:48 +02:00
Douwe Maan aaef30aaec Merge pull request #9591 from bozaro/user-by-key
Add API method for get user by ID of an SSH key
2015-09-03 15:18:28 +01:00
Valery Sizov f5ffeac058 Create labels in new project 2015-09-03 17:12:15 +03:00
Dmitriy Zaporozhets aeeb31d6b7
Change some base colors in UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 15:46:13 +02:00
Artem V. Navrotskiy 1be79e8e7c Move get user by ID of an SSH key documentation to separate file 2015-09-03 16:32:26 +03:00
Dmitriy Zaporozhets 6d651a0260
Increase use of variables in css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 15:09:55 +02:00
Valery Sizov 57d0013090 CRUD for admin labels 2015-09-03 15:50:23 +03:00
Artem V. Navrotskiy 8ec59bd18b Add API method for get user by ID of an SSH key 2015-09-03 15:47:22 +03:00
Dmitriy Zaporozhets 1d6a65a2ab
Improve paddings and set new colors for links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 14:43:31 +02:00
Dmitriy Zaporozhets 7f045a6b4a
Apply new font size and padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 14:24:27 +02:00
Dmitriy Zaporozhets 63ba17c4db Redesign activity feed on dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 13:46:11 +02:00
Dmitriy Zaporozhets 59d9dc4408
Reduce margin under projects filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 10:24:10 +02:00
Dmitriy Zaporozhets 6630a06c40 Merge branch 'ui-improvements' into 'master'
Implement new design for projects page

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

For #2413

See merge request !1236
2015-09-03 07:14:20 +00:00
Robert Speicher ff8fb6a6a2 Merge branch 'update-mailroom' into 'master'
Update mail_room to 0.4.2 for better error handling

See merge request !1234
2015-09-02 21:53:50 +00:00
Dmitriy Zaporozhets 6fb7311e6e
Fix home page for mobile devices
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 22:28:40 +02:00
Dmitriy Zaporozhets d0cfa4651c Avoid horizontal scroll in sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets c5786649c9 Keep header fluid for big res
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets 418dd5ebf8 Collapse sidebar button at the bottom
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets b879407695 Fix collapsed sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets 4406aeff05 Implement new design for projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 21:57:32 +02:00
Dmitriy Zaporozhets 14274cdc3b Merge branch 'refactor-starred-projects-page' into 'master'
Split starred projects list and activity

In same way like we did with your projects. For consistency

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

See merge request !1238
2015-09-02 19:50:37 +00:00
Dmitriy Zaporozhets d9f794a850 Merge branch 'grack-auth-new-instance' into 'master'
Avoid instance variable re-use trouble

This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.

See merge request !1237
2015-09-02 18:05:16 +00:00
Dmitriy Zaporozhets 774c523c1f
Fix tests and update CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 20:02:26 +02:00
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