home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 13:16:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,132 Commits 48 Branches 340 Tags
docker-updates
Commit Graph
232 Commits
Author SHA1 Message Date
Stan Hu 0346e9724a Tweak remaining CSS for Markdown preview 
Missed a few items in !1378
 2015-09-21 14:08:26 -07:00
Dmitriy Zaporozhets b6de7ad49e Fix 500 on trending projects if isntance has 100k+ projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 10:45:42 +02:00
Darby def939a562 Turned off autocomplete for new issue titles 2015-09-09 15:04:38 -07: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 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 c13ef89862 Make UI more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 11:17:25 +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
Dmitriy Zaporozhets 0195b085a1 Style groups page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 17:21:48 +02: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
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 4406aeff05 Implement new design for projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:32 +02:00
Douwe Maan 30555c1d24 Merge branch 'rs-remove-user-color-scheme-class' into 'master' 
Apply syntax highlighting to fenced code blocks client-side

Instead of applying the syntax highlighting scheme class to these blocks
server-side, we use Javascript and Gon to apply the user's color scheme
(or the default) client-side.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.

See merge request !1203
 2015-08-27 16:24:51 +00: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 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 b54358b457 Refactor project list rendering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 22:44:02 +02: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 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
Dmitriy Zaporozhets c11e43145f Make some visual improvements to dashboard page after we moved activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 15:23:25 +02:00
Douwe Maan 0daa21ed8c Merge branch 'fix-email-autocomplete' into 'master' 
Fix bug preventing invite by e-mail

This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320

See merge request !1181
 2015-08-21 22:25:59 +00:00
Stan Hu 577df6b8ca List the current user first in issuable dropdowns 2015-08-21 14:27:21 -07:00
Stan Hu 3715a0f29b Fix bug preventing invite by e-mail 
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320
 2015-08-21 13:47:56 -07:00
Douwe Maan 77e508d8fd Fix bug where non-project members of the target project could set labels on new merge requests. 2015-08-20 18:32:32 -07:00
Dmitriy Zaporozhets 91836272fe Merge branch 'mr-widget-text' into 'master' 
Improve text of MR merge widget and manual merge modal

Modal with manual merge instructions:

![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png)

Archived:

![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png)

WIP:

![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png)

Missing target branch:

![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png)

Missing source branch:

![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png)

Nothing to merge:

![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png)

Checking ability to merge:

![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png)

Conflicts when allowed to merge:

![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png)

Conflicts when not allowed to merge:

![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png)

Mergeable when allowed to merge:

![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png)

Mergeable when not allowed to merge:

![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png)

Merge in progress:

![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png)

Merge failed:

![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png)

Merged:

![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png)

Closed:

![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png)

cc @dzaporozhets @rspeicher

See merge request !1120
 2015-08-11 19:24:50 +02:00
Dmitriy Zaporozhets f293d991a4 Revert "Merge branch 'mr-widget-text' into 'master' " 
This reverts commit 151d9fb35f, reversing
changes made to 819d110cab.
 2015-08-11 10:26:12 +02:00
Douwe Maan b8590da024 Improve MR merge widget text and UI consistency. 2015-08-08 21:24:43 +02:00
Douwe Maan 66cc712fa5 Fix method name. 2015-07-30 15:31:34 +02:00
Robert Speicher e496c35fed Dynamically check :admin_* ability on issuable form 
Closes #2092
 2015-07-24 15:50:12 -04:00
Robert Speicher 37bc7bac19 Add Issuable#to_ability_name 2015-07-24 15:50:12 -04:00
Robert Speicher e65b081062 Dynamically check :admin_* ability in issuable context 
Closes #2001
 2015-07-19 16:48:33 -04:00
Marin Jankovski 057d45fb23 Use password field default password masking. 2015-07-13 13:32:14 +02:00
Dmitriy Zaporozhets bda04bc687 Merge branch 'fork_visibility_level' into 'master' 
Forks should not have more permissive visibility levels than the original

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

See merge request !936
 2015-07-10 12:05:54 +00:00
Dmitriy Zaporozhets 27a9ff8264 Merge branch 'rs-dev-issue-2372' into 'master' 
Filter by issues/merge requests without a milestone

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

See merge request !886
 2015-07-08 21:42:29 +00:00
Dmitriy Zaporozhets 5e7f7f8d31 Redesign project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 15:22:56 +02:00
Robert Speicher 3ee3cb24d4 Allow user to filter by Issues/Merge Requests without a Milestone 2015-07-06 22:39:55 -04:00
Valery Sizov 111ebe5471 Fork visibility level fix 2015-07-06 17:40:33 +03:00
Dmitriy Zaporozhets d5947ada44 Simplify set of assignee, milestone and label to admin_issue rule 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:45:45 +02:00
Dmitriy Zaporozhets b9fa82daee Update tests and use js-issuable class for context form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:05:30 +02:00
Dmitriy Zaporozhets a9095280c7 UsersSelect is part of filter so I rather keep js executed in partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:54:35 +02:00
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:04:50 +02:00
Dmitriy Zaporozhets d315d1eba4 Dont allow guest to set assigne, milestone and label when create new issue or merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 15:38:04 +02:00
Dmitriy Zaporozhets 60baa1e866 Move issuable partials in common directory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 15:11:22 +02:00
Dmitriy Zaporozhets cc9b5c49d1 Merge branch 'revert-mr-state-names' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
 2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets ea9dda9541 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-22 11:26:33 +02:00
Douwe Maan c0df5ff126 Merge branch 'snippet_optional_filename' into 'master' 
Make snippet filename optional.

Fixes #2384.

See merge request !1866
 2015-06-20 10:47:06 +00:00
Nicolas aecc989154 Make snippet filename optional. 
Fixes #2384.
 2015-06-20 01:06:57 +02:00
Dmitriy Zaporozhets 7524d7c082 Revert merge request states renaming 
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 17:09:50 +02:00
Robert Speicher da15428340 Simplify line numbering 2015-06-19 04:31:24 -04:00
Robert Speicher b3f9be0639 Refactor and spec BlobView JS 2015-06-19 04:31:23 -04:00