home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 08874d2b51 Make changes to nginx config less likely to break something. 2015-02-20 23:27:17 +01:00
Dmitriy Zaporozhets acc312fc25 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-20 13:54:21 -08:00
Marin Jankovski f5888bd2e8 Merge branch 'master' into 'master' 
Added gitorious.org importer

Heavily inspired by GitHub and GitLab importers.

See merge request !343
 2015-02-20 21:52:30 +00:00
Dmitriy Zaporozhets 2617f8d14a Merge branch 'improve-web-hooks' into 'master' 
Improve web hooks

* add git_http_url and git_ssh_url to project web hook
* add visibility_level to project web hook
* add documentation about project visibility_level in API

Fixes #2018, #2030

cc @sytse

See merge request !1560
 2015-02-20 21:40:59 +00:00
Douwe Maan 0c4d27e82d Point out nginx config changes in update guides. 2015-02-20 22:36:19 +01:00
Douwe Maan 2f76ccdfac Base new MR description on commit description if there's only one. 2015-02-20 22:17:38 +01:00
Dmitriy Zaporozhets 92434b29cc Extend project web hooks with more data 
* add git_http_url and git_ssh_url to project web hook
* add visibility_level to project web hook
* add documentation about project visibility_level in API
 2015-02-20 10:27:37 -08:00
Marcin Kulik 157b4b4b1f Add gitorious.org importer 2015-02-20 17:42:58 +00:00
Dmitriy Zaporozhets 1f617c3c5f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-20 09:10:10 -08: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
Dmitriy Zaporozhets bba0b9f930 Merge branch 'commits-calendar-height' into 'master' 
Fix commits calendar vertical days.

Fixes #2031.

Before:

![Screen Shot 2015-02-20 at 14.36.31](https://dev.gitlab.org/uploads/gitlab/gitlabhq/08d322797b/Screen_Shot_2015-02-20_at_14.36.31.png)

After:

![Screen Shot 2015-02-20 at 14.35.54](https://dev.gitlab.org/uploads/gitlab/gitlabhq/0cfbabad26/Screen_Shot_2015-02-20_at_14.35.54.png)

See merge request !1555
 2015-02-20 17:01:43 +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 2570e4df79 Fix specs. 2015-02-20 16:55:38 +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
Derek Campbell 874640123b To close an issue you must set 'state_event' to 'close'. I cannot set 'closed' to '1'. 2015-02-20 09:20:42 -04:00
Douwe Maan 73d12d6e6d Update changelog. 2015-02-20 13:24:51 +01:00
Douwe Maan 00ca490259 Use controllers to serve uploads, with XSS prevention and access control. 2015-02-20 13:13:48 +01:00
Douwe Maan 4310431ee7 Use modified ActionDispatch::Static to let uploads go through to routes. 2015-02-20 12:44:07 +01:00
Douwe Maan eb210f4a18 Modify nginx config to let /uploads go through to unicorn. 2015-02-20 12:22:53 +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
Robert Schilling 5640445108 Merge pull request #8828 from j0k3r/patch-1 
Update CHANGELOG
 2015-02-20 11:16:50 +01:00
Jeremy 7ce664c88e Update CHANGELOG 
Add myself to the changelog for the Asana service #8580
 2015-02-20 10:47:01 +01: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 6b0199ffc1 Merge branch 'ui-improvements' into 'master' 
UI improvements

* lighter color for comments count
* better UI for issue assigee.milestone block

See merge request !1551
 2015-02-20 08:36:28 +00: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 a6220d0a9f Update CHANGELONG 2015-02-19 22:49:49 -08:00
Dmitriy Zaporozhets 56af5f5cf9 Improve commits page UI 2015-02-19 22:42:54 -08:00
Dmitriy Zaporozhets 2f2d82e945 Merge branch 'ui-improvements' into 'master' 
Ui improvements

* improve UI for commits, issues and merge requests lists
* refactor commit css

See merge request !1550
 2015-02-20 06:25:09 +00: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 de040ffaae Merge branch 'ui-improvements' into 'master' 
Ui improvements

* update bootstrap
* move milestones and labels to the left
* make open/closed/all filter as tab
* make issues page more compact

For  #1871

See merge request !1549
 2015-02-20 02:03:04 +00: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