home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
4837 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets bcc04adb13 Css/views cleanup after layout restyle 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-21 01:11:08 +02:00
Dmitriy Zaporozhets abd83baeab Admin area using side nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-21 00:23:17 +02:00
Drew Blessing a9761ac1b8 Differentiate system notes 2014-12-20 16:20:29 -06:00
Dmitriy Zaporozhets dc0879ac9e Merge pull request #7882 from cirosantilli/blob-instance-to-local 
Use blob local instead of instance.
 2014-12-20 20:19:59 +02:00
Dmitriy Zaporozhets e007d810c9 Merge pull request #7886 from cirosantilli/disable-blob-edit-mr 
Disable / hide MR edit blob button if cannot edit.
 2014-12-20 20:19:38 +02:00
Dmitriy Zaporozhets a978673362 Merge pull request #8451 from skv-headless/transfer-error-handler 
transfer error handler
 2014-12-20 19:46:04 +02:00
Dmitriy Zaporozhets b667a45942 Restyle issue/mr/milestone to new layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-18 17:22:10 +02:00
Dmitriy Zaporozhets d6eda842a9 Sidenav for profile area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-17 12:44:36 +02:00
Dmitriy Zaporozhets 51ee71d8e0 Migrate public layouts to new design 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-17 12:26:33 +02:00
Dmitriy Zaporozhets eb2face2cb Dashboard layout uses sidenav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-17 12:20:05 +02:00
Dmitriy Zaporozhets 06a219baa5 Restyle group page and event filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-16 18:15:48 +02:00
Dmitriy Zaporozhets f3f27fee88 Left-side navigation for group layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-16 16:58:15 +02:00
Drew Blessing f06f69b9da Add theme type css class 2014-12-15 13:21:26 -06:00
Dmitriy Zaporozhets 7b71a9e221 Add icons to project sidenav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 20:00:44 +02:00
Dmitriy Zaporozhets 5f797be0e8 Mobile UI fixes for sidebar nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 18:06:03 +02:00
Dmitriy Zaporozhets 5f63c00598 Fix graph and settings highlight 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 17:46:36 +02:00
skv-headless c4a56797a4 transfer error handler 2014-12-15 16:10:56 +03:00
Dmitriy Zaporozhets 2f13d4daa3 Implement sidebar navigation for project area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 21:49:51 +02:00
Miz 2ff6066088 Add commit dates to repository-push email tempalte 2014-12-11 14:18:18 +02:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets 8c727feea6 Merge branch 'small-fixes' into 'master' 
Small fixes

Improve application stability over unexpected cases

See merge request !1310
 2014-12-07 12:49:48 +00:00
Dmitriy Zaporozhets 7cefd9c6ef Prevent 500 on MR page if merge_event missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 18:10:25 +02:00
Dmitriy Zaporozhets e0f30c605b Add author filter for issues & merge requests pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 17:13:07 +02:00
Dmitriy Zaporozhets ed2eaf55c1 Move issues/mr filter to partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:59:17 +02:00
Dmitriy Zaporozhets 6487419364 Automatically close merge requests that were locker for 1 day 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:02:08 +02:00
Dmitriy Zaporozhets d31d711a70 DRY and refactor atom code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 22:14:20 +02:00
Dmitriy Zaporozhets a46fe875c6 Feature: atom feed for user activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 21:49:19 +02:00
Dmitriy Zaporozhets e1f1e062a8 Merge branch 'multi_provider' into 'master' 
Supporting for multiple omniauth provider for the same user

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721

and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760

See merge request !1296
 2014-12-04 16:03:04 +00:00
Valery Sizov b56b96d438 added helper 2014-12-04 13:03:55 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Dmitriy Zaporozhets d80a59c7b1 Create helper for sort drowdown option names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 12:10:38 +02:00
Dmitriy Zaporozhets 279952bb78 Show issue/mr id in the list below title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-03 17:29:52 +02:00
Dmitriy Zaporozhets ac04665a8c Merge branch 'show-cross-project-ref' into 'master' 
Show cross project ref

Fixes #1661

See merge request !1292
 2014-12-03 11:02:34 +00:00
Dmitriy Zaporozhets ed1c22568a Add cross-project reference tooltip for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-03 11:40:04 +02:00
Dmitriy Zaporozhets ba51a1dd32 Render cross reference in issue title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-03 11:15:00 +02:00
Dmitriy Zaporozhets a70e7d61ac Merge branch 'improve-form-links-ux' into 'master' 
Improve issuable form links UX

> The create new label / milestone links should open in a new window / popup to avoid losing information already filled in for a new issue.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/855

See merge request !1291
 2014-12-02 21:36:38 +00:00
Dmitriy Zaporozhets 300311f395 Merge branch 'improve-search-ux' into 'master' 
Improve search ux

When I use search from merge requests page I usually want to see merge requests results. If I do search from wiki pages -> I want to see wiki results first.

With this patch search scope is set to issues if you are on issues controller and same for merge requests and wikis

See merge request !1290
 2014-12-02 21:36:10 +00:00
Dmitriy Zaporozhets c5bdc7e13a New label/milestone link from issue form opens in new window 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 22:47:19 +02:00
Dmitriy Zaporozhets 5f15ed04fc Respect current controller scope when using search from project area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 22:38:45 +02:00
Dmitriy Zaporozhets 12f8699296 Fix safari 8 ui issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 22:30:06 +02:00
Dmitriy Zaporozhets f447aed26a Merge branch 'improve-mobile-ui' into 'master' 
Improve mobile UI pt2

Next UI elements were improved for mobile view

* comments
* comment form
* issues navigation
* removed duplicate MR sidebar btn
* tabs

Desktop improvements:

* increase comment author username font size
* dark colour for comment author name

Related to #1493

See merge request !1285
 2014-12-02 12:22:26 +00:00
Dmitriy Zaporozhets bf39347970 Merge branch 'larger-avatar' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-12-02 12:44:18 +02:00
Sytse Sijbrandij 8f60144782 Change avatar file size to 200kb. 2014-12-02 10:32:24 +01:00
Dmitriy Zaporozhets 4cbe72d767 UI improvements mostly for mobile screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 11:31:57 +02:00
Robert Schilling 86c55106a0 Change twitter handle from gitlabhq -> gitlab 2014-12-01 17:45:25 +01:00
Dmitriy Zaporozhets f53e0fff47 Show username in comment header for easier mention 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-01 17:40:45 +02:00
Dmitriy Zaporozhets 9d93729313 Move projects import to separate resource. Add bare repo creation to repository controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 00:50:25 +02:00
Dmitriy Zaporozhets a8df4ee9e2 Separate web page for projects without repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 00:49:51 +02:00
Dmitriy Zaporozhets 674cbe939c Dont allow project creation without repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-29 21:34:18 +02:00
Marin Jankovski e4af2b3db5 Merge branch 'milestones_labels' into 'master' 
Possibility to create Milestones or Labels when Issues are disabled

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

See merge request !1270
 2014-11-21 11:11:52 +00:00