home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +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 2da2720584 Improve css for file actions 2015-03-13 19:20:25 -07:00
Dmitriy Zaporozhets 309f588d56 Merge branch 'fix-encoding' into 'master' 
Minor cleanup around UTF-8 encoding.

Minor cleanup to be merged after https://dev.gitlab.org/gitlab/gitlab_git/merge_requests/24 is merged in.

See merge request !1642
 2015-03-13 16:50:53 +00:00
Douwe Maan 09791774a5 Use custom LDAP label in LDAP signin form. 2015-03-13 15:42:31 +01:00
Douwe Maan f96dc6295a Everything from gitlab_git is already UTF-8. 2015-03-13 13:49:27 +01:00
Dmitriy Zaporozhets ec02cdf205 Merge branch 'master' into mr-filter-by-title 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
 2015-03-12 16:29:03 -07:00
Dmitriy Zaporozhets 80b2f3fb86 Implement merge requests search 
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
 2015-03-12 16:20:58 -07:00
Dmitriy Zaporozhets 2fe69158f0 Merge branch 'group-icon-performance' into 'master' 
Prevent database query each time we render group avatar

Fixes #2118

See merge request !1688
 2015-03-12 22:28:47 +00:00
Marin Jankovski 1c3997a747 Merge branch 'replace_passwords_with_asterisk' into 'master' 
Show asterisks instead of password in service edit form.

See merge request !1686
 2015-03-12 22:27:46 +00:00
Dmitriy Zaporozhets 7ac62388a5 Prevent database query each time we render group avatar 2015-03-12 13:56:53 -07:00
Dmitriy Zaporozhets 0f144f36bc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-12 11:19:03 -07:00
Dmitriy Zaporozhets 12ba855ffd Merge branch 'improve-import-page' into 'master' 
Style improvements to import page

See merge request !1685
 2015-03-12 18:18:05 +00:00
Hannes Rosenögger 7ff9c8229d Add a service to support external wikis 2015-03-12 19:13:51 +01:00
Douwe Maan d66148ef39 Merge branch 'fix_email_images' into 'master' 
Fix email images

## Dependencies:
This MR Depends on gitlab-org/html-pipeline-gitlab!4 being **merged and published** to rubygems.org

## What does this MR do?
This MR fixes the broken images in emails that occured scince we introduced access control for all attachments in 7.8.
The access control lead to broken images, because the user usually isn't logged into gitlab when opening the email in his mail client.
The solution to fix this, is to replace all images that were uploaded to gitlab as attachemnts with inline images in emails.

I only added one test for images in notes, because all notes share the same view. If it works fine for a note on a commit, then it'll also work the same for notes on a MR or on issues.

@DouweM can you review this please?

Closes #1161

See merge request !373
 2015-03-12 17:40:17 +00:00
Marin Jankovski a1f5ae98e2 Show asterisks instead of password in service edit form. 2015-03-12 10:10:19 -07:00
Dmitriy Zaporozhets dd78cd1ce4 Style improvements to import page 2015-03-12 10:04:09 -07:00
Hannes Rosenögger 3c7e0f45c2 replace images in emails with inline images 
This adds the functionality of replacing all images that were uploaded
to gitlab with inline images(base64) in emails.
This change fixes the broken images in emails that 7.8 introduced
 2015-03-12 09:26:06 +01:00
Dmitriy Zaporozhets 158507d942 Add blue theme to GitLab 2015-03-11 21:29:11 -07:00
Dmitriy Zaporozhets d12a6ac49a Merge branch 'dashboard-restyle' into 'master' 
Dashboard restyle

For #2069

See merge request !1675
 2015-03-11 16:56:01 +00:00
Dmitriy Zaporozhets 9839d106c4 Rename dashboard landing page to Your projects 2015-03-10 16:06:30 -07:00
Dmitriy Zaporozhets 0414b2ae98 Remove projects page from dashboard 2015-03-10 16:03:37 -07:00
Dmitriy Zaporozhets 83f7e98d9a Add project filter by visibility and tag to explore page 2015-03-10 15:59:14 -07:00
Dmitriy Zaporozhets 7fd4dc1e11 Remove group rendering from dashboard page 2015-03-10 13:17:16 -07:00
Dmitriy Zaporozhets ea7478d6b5 Fix features checkboxes at admin settings page 2015-03-10 12:59:39 -07:00
Dmitriy Zaporozhets 100d750bc5 Add feature to disable version check 2015-03-10 12:51:46 -07:00
Hannes Rosenögger 52a00854e9 Merge branch 'master' into 'master' 
Added link generation for LinkedIn on user's Profile page

This is a very very minor change. Added a generated link to the LinkedIn portion of the user's profile.

See merge request !377
 2015-03-10 15:16:04 +00: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
Dmitriy Zaporozhets 73179685b0 Add version check to help page too 2015-03-09 21:03:24 -07:00
Dmitriy Zaporozhets 345fd545bf Add version check badge to admin area 2015-03-09 20:58:28 -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 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
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 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
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
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 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 b5c3e1a431 Add GitLab UI development kit 2015-03-08 14:46:22 -07:00
Dmitriy Zaporozhets df13c9cac9 Hide user page sidebar for mobilde devices 2015-03-08 12:05:15 -07:00
Vinnie Okada cacac147de Move restricted visibility settings to the UI 
Add checkboxes to the application settings page for restricted
visibility levels, and remove those settings from gitlab.yml.
 2015-03-07 13:11:08 -07:00