home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Stan Hu 4218a2bfcf Fix code preview theme setting for comments, issues, merge requests, and snippets. 
Also preserve code preview color scheme in events dashboard.

Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]">

Closes #1139
 2015-03-10 08:11:20 -07:00
Ben Carson ee45fa89b6 Added a link_to for the LinkedIn portion of the user's profile. It felt odd to me, having this section not being an active link like the rest of the entries on the page. 2015-03-10 11:07:31 -04:00
Douwe Maan 76842aac75 Properly move over issues_tracker_id from old custom issue tracker URLs. 2015-03-10 14:14:49 +01:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01:00
Douwe Maan ca9aca9279 Allow smb:// links in Markdown text. 2015-03-10 13:32:28 +01:00
Hannes Rosenögger 332413d7c4 Merge branch 'fix-import-redirect' into 'master' 
Fixing import redirect loop

While importing, don't redirect import actions to the project page, even if the repository exists

Fixes #1191

See merge request !379
 2015-03-10 10:58:35 +00:00
Valery Sizov ed4c7190ed Fix importers with OCC 2015-03-10 12:23:11 +02:00
Nicole Cordes b7a31a4b02 Generate valid json for hooks 
It seems that ruby can handle 'nil' value but other json processors
(like PHP) throw an error. This is always generated for empty arrays.
 2015-03-10 10:07:25 +01:00
Douwe Maan 94a955893c Merge branch 'fix-commit-calendar-emails' into 'master' 
Fix commit calendar to use all user emails

This MR improves upon Hannes Rosenögger's changes:

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/364

See merge request !378
 2015-03-10 08:58:35 +00:00
Dmitriy Zaporozhets e0caed91e2 Improve tree view UI 2015-03-10 00:51:16 -07:00
Stan Hu b26ab0ceeb This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account. 
This fixes one of the problems mentioned in gitlab-org/gitlab-ce#1162 and makes the behavior of the commit calendar as described in the profile.
"All email addresses will be used to identify your commits."
 2015-03-09 21:43:54 -07:00
Dmitriy Zaporozhets 73179685b0 Add version check to help page too 2015-03-09 21:03:24 -07:00
Dmitriy Zaporozhets deb384a73b Prevent crash if file does not exists 2015-03-09 20:58:29 -07:00
Dmitriy Zaporozhets 345fd545bf Add version check badge to admin area 2015-03-09 20:58:28 -07:00
Dmitriy Zaporozhets d086221f73 Merge branch 'active-users' into 'master' 
Blocking user does not remove him/her from project/groups but show blocked label

For #248

See merge request !1664
 2015-03-10 03:38:25 +00:00
Dmitriy Zaporozhets 21c99e6a77 Fix font size for collapse button 2015-03-09 19:21:42 -07:00
Dmitriy Zaporozhets de629b4835 Blocking user does not remove him/her from project/groups but show blocked label 2015-03-09 19:02:30 -07:00
Dmitriy Zaporozhets f6113c2818 Merge branch 'font-size-14' into 'master' 
Font size 14px

Increase base font size from 13 to 14px. We already have it in most of ui elements so no need to duplicate `font-size: 14px` everywhere - just change base variable

See merge request !1663
 2015-03-10 01:46:21 +00:00
Dmitriy Zaporozhets 3bce263a3d Reduce base vertical padding 2015-03-09 18:45:36 -07:00
Dmitriy Zaporozhets fcaf0a89e8 Fix heading small color to darker one 2015-03-09 18:28:30 -07:00
Dmitriy Zaporozhets 9720240be2 Increate default font-size from 13 to 14px 2015-03-09 18:25:32 -07:00
Dmitriy Zaporozhets 86a17390dd Make broadcast message look like a warning by default 2015-03-09 18:09:23 -07:00
Dmitriy Zaporozhets 90f5dacc4b Fix wrong body padding and pre color 2015-03-09 17:59:32 -07:00
Dmitriy Zaporozhets b70b1055b1 Merge branch 'more-flat-ui' into 'master' 
Apply more styles from Flatly theme

Also add bottom margin for footer links on login page

See merge request !1661
 2015-03-10 00:41:01 +00:00
Dmitriy Zaporozhets 2a76c7fd8a Merge branch 'improve-milestones-ui' into 'master' 
Improve milestones ui

* change progress bar colors
* make milestone title bold

See merge request !1660
 2015-03-10 00:13:28 +00:00
Dmitriy Zaporozhets 6b76ffc222 Apply more styles from Flatly theme 
Also add bottom margin for footer links on login page
 2015-03-09 17:06:08 -07:00
DJ Mountney 23fabc081d Fixing import redirect loop 
While importing, don't redirect import actions to the project page, even if the repository exists
 2015-03-09 16:36:41 -07:00
Dmitriy Zaporozhets b51e2a0559 Merge branch 'starred-projects' into 'master' 
Add starred projects page to dashboard

For #1836 and #2069

See merge request !1659
 2015-03-09 23:26:58 +00:00
Dmitriy Zaporozhets 3e6147ada4 Make milestone titles in list to be bold 2015-03-09 16:24:45 -07:00
Dmitriy Zaporozhets c6b2421127 Render milestone progress with one helper method 2015-03-09 15:20:32 -07:00
Dmitriy Zaporozhets d36ee3190a Add starred projects page to dashboard 2015-03-09 14:12:03 -07:00
Dmitriy Zaporozhets dd24c3d4b9 Improve user block/unblock UI in admin area 2015-03-09 13:02:06 -07:00
Dmitriy Zaporozhets e89ffd546e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-09 09:44:07 -07:00
Dmitriy Zaporozhets 7e574a896b Merge branch 'dashboard-groups' into 'master' 
Move profile groups page to dashboard

For #2069

See merge request !1654
 2015-03-09 16:43:36 +00:00
Marin Jankovski d6c13ec0b2 Merge branch 'button_changes' into 'master' 
Change button styles

Styles for buttons are changed to match user expectations.

Fixes #2004

See merge request !1580
 2015-03-09 16:21:31 +00:00
Hannes Rosenögger 224e104d8d fix mass SQL statements on initial push 
This commit disables process_commit_messages()
for the initial push to the default branch.
This fixes the mass SQL statements (~500000) that were executed during
the initial push of the linux kernel for example.
 2015-03-09 12:52:45 +01:00
Dmitriy Zaporozhets bb9560a35a Show total user count on dashboard page 2015-03-08 20:45:03 -07:00
Martin Bastien 21aff22adb Fix link to bitbucket import documentation 
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
 2015-03-08 22:26:46 -04:00
Dmitriy Zaporozhets bb7be246f6 Show active users(non-blocked) on admin dashboard 2015-03-08 17:30:01 -07:00
Dmitriy Zaporozhets 9b3e156e43 Move profile groups page to dashboard 2015-03-08 17:03:30 -07:00
Vinnie Okada 928fc94c3d Enforce restricted visibilities for snippets 
Add new service classes to create and update project and personal
snippets.  These classes are responsible for enforcing restricted
visibility settings for non-admin users.
 2015-03-08 17:57:08 -06:00
Dmitriy Zaporozhets 8b551ee318 Merge branch 'emails-on-push' 
Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/project_services/emails_on_push_service.rb
 2015-03-08 16:49:11 -07:00
Dmitriy Zaporozhets c025c0d589 Merge branch 'webstorage-exception' into 'master' 
Properly handle autosave local storage exceptions.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1182.

See merge request !1643
 2015-03-08 23:43:40 +00:00
Dmitriy Zaporozhets cec2be2d76 Merge branch 'fix-milestone-list-width' into 'master' 
Fix width of text in milestone lists and add assignee icon to merge requests.

Before:

![Screen_Shot_2015-03-06_at_13.48.00](https://dev.gitlab.org/gitlab/gitlabhq/uploads/5754638a3ebb79dee1f6c07a6e268035/Screen_Shot_2015-03-06_at_13.48.00.png)

After:

![Screen_Shot_2015-03-06_at_13.48.14](https://dev.gitlab.org/gitlab/gitlabhq/uploads/fe92adf387964efb3d460dfc61ced3b8/Screen_Shot_2015-03-06_at_13.48.14.png)

I've checked with other screen widths as well, and it looks good all the time.

See merge request !1645
 2015-03-08 23:41:26 +00:00
Dmitriy Zaporozhets f930cf8461 Merge branch 'dev-ui' into 'master' 
GitLab UI development kit and UI guide help section

Page with UI elements get generated from current css so you can immediately check how your css changes affects common ui elements. Because it requires GitLab runnning I cannot put it to documentation so I just put link to localhost from development section

cc @developers @sabba @sytse

See merge request !1653
 2015-03-08 23:18:32 +00:00
Dmitriy Zaporozhets f3d78ee31a Add markdown info to UI dev kit page 2015-03-08 15:21:47 -07:00
Dmitriy Zaporozhets 1b5ca280d8 Merge two css files with same name 2015-03-08 15:21:28 -07:00
Vinnie Okada 285c534185 Allow admins to override restricted visibility 
Allow admins to use restricted visibility levels when creating or
updating projects.
 2015-03-08 16:10:05 -06:00
Dmitriy Zaporozhets b5c3e1a431 Add GitLab UI development kit 2015-03-08 14:46:22 -07:00
Dmitriy Zaporozhets 2e99d7c915 Prevent date overflow on issue page on mobile devices 2015-03-08 12:15:09 -07:00