home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,203 Commits 48 Branches 340 Tags
00ac792cfba52dffbbfd1bf304059fcd63d7e688
Commit Graph
254 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 696a708401 Move rendering CI status to helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-23 17:32:52 +02:00
Dmitriy Zaporozhets 01315cfe76 Merge branch 'hanloong/gitlab-ce-add-dates-snippets-show' into 'master' 
Update style of snippets pages

![Screen_Shot_2015-10-18_at_13.04.13](/uploads/95d58b64fa81aa4e75568d2d7b4a6b08/Screen_Shot_2015-10-18_at_13.04.13.png)

![Screen_Shot_2015-10-21_at_11.11.10](/uploads/106371d718a07a9ccdad9148812211fd/Screen_Shot_2015-10-21_at_11.11.10.png)

Replaces !1567.

Fixes #1767 and #2538.


See merge request !1637
 2015-10-22 13:34:34 +00:00
Douwe Maan d37cf64237 Merge branch 'master' into hanloong/gitlab-ce-add-dates-snippets-show 2015-10-21 10:24:06 +02:00
Job van der Voort dd0552c36d Animate the logo on hover 
The logo is now rendered as pure SVG, rather than image referencing a
svg. The SVG has an id and the shapes of the logo have a shared class.
The shapes change their fill color on hover with a transition.
 2015-10-21 08:59:30 +02:00
Douwe Maan b371b6d139 Update style of snippet detail page 2015-10-18 12:54:02 +02:00
Douwe Maan eeea6ef25f Sentences end in periods. 2015-10-18 12:19:42 +02:00
Han Loong Liauw 1565a95da1 Merge branch 'master' into add-dates-snippets-show 2015-10-17 09:30:43 +11:00
Han Loong Liauw 1f92c22fec New snippet design for projects 
Split out header into shared partial
Used action partials to have unique actions for shared and personal
snippets
changed back to created date in list view
Switched to using existing color classes
 2015-10-14 23:53:52 +11:00
Douwe Maan d10e3c4498 Merge branch 'master' into filter-label 2015-10-14 13:23:01 +02:00
Douwe Maan 3a69dd20a1 Allow dashboard and group issues/MRs to be filtered by label 2015-10-14 12:33:39 +02:00
Han Loong Liauw e1d70c4f31 Merge branch 'master' into add-dates-snippets-show 
Also removed fixes to btn-sm as they have appears to
be already merged into master
 2015-10-14 19:46:27 +11:00
Valery Sizov 0e34154d21 Project names are not fully shown if group name is too big, even on group page view 2015-10-13 11:37:57 +03:00
Valery Sizov d805c5dbb3 Add spellcheck=false to certain input fields 2015-10-12 12:54:54 +03:00
Han Loong Liauw 857cc388e1 Adds modified date to snippets#show #1767 
- Fixed a bug with .btn-sm padding.
 - Changed created_at to modified_at for snippets#index as it seems to
   be more relevant.
 2015-10-12 18:38:34 +11:00
Stan Hu b60bc655f2 Restore placeholders in issue filters from "Any" to "Milestone" and "Label" 
1f11096c included new filters but made it hard to determine which dropdown did
what. This patch restores the original placeholders.
 2015-10-08 23:53:32 -07:00
Robert Speicher de3ff174e7 Quick Submit all the things! 
Adds quick submit behavior to the forms for:

- Blobs ("new file")
- Commit messages
- Issuables
- Notes
- Labels
- Milestones
- Wikis
 2015-10-07 15:23:42 -04:00
Stan Hu dfbbc80611 Support filtering by "Any" milestone or issue and fix "No Milestone" and "No Label" filters 
Closes #2619

Closes https://github.com/gitlabhq/gitlabhq/issues/9631
 2015-10-07 07:21:50 -07:00
Valery Sizov 731b860976 Hide password in the service settings form 2015-10-02 12:48:57 +03:00
Dmitriy Zaporozhets 145d933880 Merge branch 'projects' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 13:42:41 +02:00
Stan Hu 04de85a994 Fix Error 500 occuring with repositories that have a bad HEAD 
A repository could have objects but no valid HEAD, causing
`project.commit` to be `nil`.
 2015-09-24 22:48:50 -07:00
Andrey 1f78c5d460 UI changes to the project view, empty project and project list new project button 2015-09-24 18:36:15 +02:00
Dmitriy Zaporozhets 353d426e4e Show CI status on Your projects page and Starred projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 14:00:23 +02:00
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