home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +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
Marco Wessel 48eeb006f0 Correct spelling of 'a project avatar' 2015-02-23 15:10:56 +01:00
Dmitriy Zaporozhets 9459e9db24 Fix updating issue 500 error 2015-02-22 22:26:09 -08:00
Dmitriy Zaporozhets 19327e6535 Fix dashboard for projects > 30 2015-02-22 22:06:43 -08:00
Marco Wessel d4bfdd34ba use update_column and set to created_at like elsewhere 2015-02-23 04:03:12 +01:00
Marco Wessel b19b8c679a Give last_activity_at a default value so it will always be set 2015-02-23 03:36:21 +01:00
Vinnie Okada 5f232b5687 Improve error messages when file editing fails 
Give more specific errors in API responses and web UI flash messages
when a file update fails.
 2015-02-22 16:01:49 -07:00
Vinnie Okada 5a8d8b6f20 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/projects.html.haml
 2015-02-22 07:55:30 -07:00
Dmitriy Zaporozhets 87b04868a1 Create Aside js class for handling all sidebars in UI for mobile devices 2015-02-21 22:01:27 -08:00
Dmitriy Zaporozhets 52902f5434 Improve projects UI a bit 2015-02-21 18:28:32 -08:00
Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml
 2015-02-21 12:55:28 -07:00
Dmitriy Zaporozhets 71e146999c Render gitlab.com import block only if host is not gitlab.com 2015-02-21 11:14:17 -08:00
Douwe Maan aba1251594 Merge branch 'master' into extend_markdown_upload 2015-02-21 13:46:58 +01:00
Douwe Maan 198d75b3a8 Initialize ZenMode on commit show and milestone edit pages. 2015-02-21 11:13:31 +01:00
Dmitriy Zaporozhets a224a655d8 Merge branch 'mr-commit-comment-diff-lines' into 'master' 
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.

Example can be seen near the bottom on this MR: !1533.

Before:

![Screen Shot 2015-02-20 at 10.24.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/35600b98b5/Screen_Shot_2015-02-20_at_10.24.34.png)

After: the [note](https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1533/diffs#note_36449) is actually rendered.

See merge request !1552
 2015-02-21 02:06:39 +00:00
Dmitriy Zaporozhets 5484acd998 Merge branch 'empty-project-redirect-vs-404' into 'master' 
Redirect from /tree/master on empty repo instead of showing 404.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/1114

See merge request !1559
 2015-02-21 02:01:21 +00:00
Marin Jankovski 51349ca3c8 Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx 
Conflicts:
	lib/support/nginx/gitlab
	lib/support/nginx/gitlab-ssl
 2015-02-20 15:47:34 -08:00
Dmitriy Zaporozhets b180476bd6 Merge branch 'mr-body-single-commit' into 'master' 
Base new MR description on commit description if there's only one.

Closes #2029, again.

See merge request !1561
 2015-02-20 23:33:23 +00:00
Marin Jankovski 8ae3112b3f Merge branch 'upload-xss-access-control' into 'master' 
Fix note attachments XSS and access control

Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032.

@marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged?

See merge request !1553
 2015-02-20 22:47:54 +00:00
Douwe Maan 2f76ccdfac Base new MR description on commit description if there's only one. 2015-02-20 22:17:38 +01:00
Marcin Kulik 157b4b4b1f Add gitorious.org importer 2015-02-20 17:42:58 +00:00
Dmitriy Zaporozhets 5311de4091 Merge branch 'mr-title-single-commit' into 'master' 
Base new MR title on commit title if there's only one.

Closes #2029.

See merge request !1558
 2015-02-20 17:05:53 +00:00
Douwe Maan 00408f37e3 Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
Douwe Maan 938a1381fc Satisfy Rubocop. 2015-02-20 16:04:03 +01:00
Douwe Maan 7f1adc3d9c Fix URL to uploaded file. 2015-02-20 16:01:37 +01:00
Douwe Maan 218283b368 Merge branch 'extend_markdown_upload' into generic-uploads 
# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb
 2015-02-20 15:37:37 +01:00
Douwe Maan 4ef6ffaad3 Split up AttachmentUploader. 2015-02-20 15:19:50 +01:00
Douwe Maan 8830cfaa60 Base new MR title on commit title if there's only one. 2015-02-20 15:06:06 +01:00
Douwe Maan c801df81fb Satisfy Rubocop. 2015-02-20 14:39:35 +01:00
Douwe Maan e0edea4ae9 Fix commits calendar vertical days. 2015-02-20 14:35:29 +01:00
Douwe Maan 00ca490259 Use controllers to serve uploads, with XSS prevention and access control. 2015-02-20 13:13:48 +01:00
krolik 51b234cfb6 Removed exceeding semicolon 2015-02-20 13:03:28 +02:00
krolik 5493e27d53 Fixed merge request diff page after back browser button is pressed. 2015-02-20 13:00:42 +02:00
Douwe Maan 0632e85c82 Fix commit comments on first line of diff not rendering in Merge Request Discussion view. 2015-02-20 10:23:34 +01:00
Dmitriy Zaporozhets 675f595406 Bigger and bold title for issue/mr show pages 2015-02-20 00:20:17 -08:00
Dmitriy Zaporozhets 50df9a7cb9 Minor css improvements 
* lighter color for comments count
* better UI for issue assigee.milestone block
 2015-02-20 00:11:25 -08:00
Dmitriy Zaporozhets abc65bbbf3 Improve sidebar navigation UI for mobile devices 2015-02-19 23:18:21 -08:00
Dmitriy Zaporozhets 74ccfa8f79 Remove overflow-y style that cause overflow-x strange behaviour on mac 2015-02-19 23:05:40 -08:00
Dmitriy Zaporozhets 56af5f5cf9 Improve commits page UI 2015-02-19 22:42:54 -08:00
Dmitriy Zaporozhets 692aa78380 Improve issue and merge request lists UI 2015-02-19 21:55:47 -08:00
Dmitriy Zaporozhets 906f8efd29 Refactor commits css 2015-02-19 20:45:21 -08:00
Vinnie Okada 83e2a1ca12 Update path helper references 
Use the path helpers for nested project resources, for Rails 4.1.9
compatibility.
 2015-02-19 21:25:28 -07:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets ee6c4a2cca Improve commits UI 2015-02-19 18:23:10 -08:00
Dmitriy Zaporozhets 6a6a334522 Fix active tab tests 2015-02-19 17:24:34 -08:00
Dmitriy Zaporozhets 00ac564423 Improve sidebar active state 2015-02-19 16:46:19 -08:00
Dmitriy Zaporozhets c2623d2e20 Sidebar items should be same height for collapsed and expanded version 2015-02-19 16:27:20 -08:00
Dmitriy Zaporozhets ad67bf51d2 Fix collapsing of milestones and labels items 2015-02-19 16:24:59 -08:00
Dmitriy Zaporozhets 78aa1bb4e2 Fix tab highlighting 2015-02-19 16:16:41 -08:00
Dmitriy Zaporozhets 4511bc1f3d Prettify milestones page 2015-02-19 15:56:23 -08:00
Dmitriy Zaporozhets b876793d03 Restlye issueable filters to be more compact 2015-02-19 15:47:10 -08:00