home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan Hu 30039dae63 Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957 
Closes #2222

Closes #2445
 2015-09-06 00:35:16 -07:00
Stan Hu a5314e79f2 Fix URL construction for merge requests, issues, notes, and commits for relative URL config 
Closes https://github.com/gitlabhq/gitlabhq/issues/9605
 2015-09-04 16:24:01 -07:00
Robert Speicher 38f1d571fe Remove style attribute from textarea during ZenMode activation 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
 2015-09-04 18:01:36 -04:00
Robert Speicher cc22a2640f Add syntax highlight scheme to notes rendered client-side 2015-09-04 17:07:24 -04:00
Dmitriy Zaporozhets 50f76ae0ea Merge branch 'ui-improvements' into 'master' 
Style project home page

Also make header more compact

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

See merge request !1246
 2015-09-04 20:22:36 +00:00
Dmitriy Zaporozhets 9793c3460f Make project page and header more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 21:36:56 +02:00
Dmitriy Zaporozhets ac6dfbd91c Make header and sidebar avatar more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 21:21:31 +02:00
Stan Hu e8bbc83771 Merge pull request #9598 from darkrasid/master 
Add image content-type header in raw download
 2015-09-04 07:49:01 -07:00
Dmitriy Zaporozhets 670544c8fa Style project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 16:14:16 +02:00
Dmitriy Zaporozhets 69beca5ae9 Merge branch 'ui-improvements' into 'master' 
UI improvements

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

See merge request !1245
 2015-09-04 14:13:53 +00:00
Dmitriy Zaporozhets aa75e76a0a Fix this crazy random failing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:36:25 +02:00
Dmitriy Zaporozhets bc6706fd6a REmove icons from milestone filters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:28:04 +02:00
Dmitriy Zaporozhets 43394f0a30 Dont render merge request target branch in list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:23:21 +02:00
Dmitriy Zaporozhets 147f95b753 Apply new style for issues, merge requests and milestone pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:22:33 +02:00
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
Robert Speicher 4883785083 Remove last remaining reference_only_path usages 2015-09-03 17:47:27 -04:00
Robert Speicher 3b690891f3 Basic support for an Atom-specific rendering pipeline 2015-09-03 17:47:15 -04:00
Stan Hu a73044320f Fix rake services:doc generation 
[ci skip]
 2015-09-03 20:54:16 +00:00
Robert Speicher 4bd92e681e Return early from markdown and gfm when text is empty 2015-09-03 16:38:35 -04: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