home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 21:16:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,924 Commits 48 Branches 340 Tags
f07b26fcefdf363fc97a495e83aeb8351bbcd8bc
Commit Graph
1825 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Dmitriy Zaporozhets de1aca131e Merge branch 'spinner-spin' into 'master' 
Spin icon next to "Checking for CI status..."

Stationary spinners make me sad.

See merge request !655
 2015-05-15 09:57:24 +00:00
Dmitriy Zaporozhets 3d4d89f060 Use count badges with number_with_delimiter helper for issue, commit count 2015-05-14 18:30:23 +03:00
Douwe Maan 191bb46d74 Use slightly fewer icons in project sidebar. 2015-05-14 17:02:00 +02:00
Douwe Maan 0b098060cc Spin icon next to "Checking for CI status..." 2015-05-14 13:27:22 +02:00
Douwe Maan 74770137f6 Always show note action icons. 2015-05-14 12:18:19 +02:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets b0b25e37c9 Merge branch 'note-role' into 'master' 
Show user roles by comments.

I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context.

![Screen_Shot_2015-05-12_at_12.15.45](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0da0eea2087d6d3b14a2c0c594575c8a/Screen_Shot_2015-05-12_at_12.15.45.png)

On hover, the note actions replace the role:

![Screen_Shot_2015-05-12_at_12.17.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/54a83c2f5047ea3ce0387f6692b14fe5/Screen_Shot_2015-05-12_at_12.17.32.png)

---

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321.

cc @sytses

See merge request !639
 2015-05-12 11:28:39 +00:00
Douwe Maan b0af379a22 Show user roles by comments. 2015-05-12 12:16:34 +02:00
Douwe Maan 4346c39ba9 Move "Forked from" above "Version". 2015-05-12 10:29:59 +02:00
Douwe Maan a5ce66d836 Move clone panel to bottom of project sidebar. 2015-05-12 10:28:56 +02:00
Douwe Maan bfe2384797 Restructure project sidebar. 2015-05-12 10:27:17 +02:00
Douwe Maan e9dff9f410 Fix alignment of ref picker, breadcrumb and buttons. 2015-05-12 10:27:17 +02:00
Douwe Maan 71a1689fec Add icons to more tabs. 2015-05-12 10:27:17 +02:00
Douwe Maan aa4d199044 Fix commits feed button. 2015-05-10 00:39:20 +02:00
Douwe Maan 164d474488 Add Merge Request button to branches page. 2015-05-09 22:55:19 +02:00
Douwe Maan 722e393589 Add Create Merge Request buttons to commits page and push event. 2015-05-09 22:26:52 +02:00
Douwe Maan 8f75ab21d0 Link Commits tab to current branch from Compare page. 2015-05-09 22:25:52 +02:00
Marin Jankovski 15909d6411 Move project visibility from clone bar to repository details block for non empty project. 2015-05-08 18:12:07 +02:00
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master' 
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
 2015-05-08 09:39:48 +00:00
Douwe Maan f5f097b765 Merge branch 'feature/handle-big-diffs' into 'master' 
Improve handling of large diffs

Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.

See merge request !539
 2015-05-07 19:29:55 +00:00
Robert Speicher 725ff58bc8 Don't add js-task-list-container to things the user can't edit 2015-05-06 13:00:13 -04:00
Robert Speicher 5c7b91e29b Single quotes/icon helper in views 2015-05-06 13:00:11 -04:00
Robert Speicher 6883e6e084 Remove all references to parse_tasks 2015-05-06 12:58:28 -04:00
Robert Speicher ce29e5cd8f Update task list behavior for Merge Requests 2015-05-06 12:58:27 -04:00
Robert Speicher 922497560e Update task list behavior for Notes 2015-05-06 12:58:27 -04:00
Robert Speicher a3d55db910 Update task list behavior for Issues 2015-05-06 12:58:27 -04:00
Dmitriy Zaporozhets f78dfa6da7 Merge branch 'refactor-mr-form' into 'master' 
Refactor mr form

* re-use issuable form for new mr page
* small UI improvements to MR compare and new pages

See merge request !616
 2015-05-06 14:50:33 +00:00
Dmitriy Zaporozhets fb00ed9983 Make README link on project home look nicer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:52:04 +03:00
Dmitriy Zaporozhets 342078a76d Small UI improvements to make project sidebar more neat 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:38:45 +03:00
Dmitriy Zaporozhets d49b993929 Small UI improvements to MR form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:19:09 +03:00
Dmitriy Zaporozhets cd108a828b Re-use issuable_form for new merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:11:47 +03:00
Dmitriy Zaporozhets 22d5e9855c When use change branches link at MR form - save source branch selection instead of target one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 15:13:11 +03:00
Dmitriy Zaporozhets 23b4cc060f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-05-06 14:28:11 +03:00
Stefan Tatschner dc68179b59 Fix a trailing new line 
The "How to Merge" modal included a trailing new line in the code
block. This commit removes that disfigurement.
 2015-05-06 11:10:48 +02:00
Jeroen van Baarsen 2856d5f9fc Merge pull request #9241 from Soullivaneuh/button-type 
Fix missing button types
 2015-05-06 10:19:17 +02:00
Alex Lossent affd049dc4 Improve handling of large diffs 
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.
 2015-05-05 18:51:12 +02:00
Dmitriy Zaporozhets cecfbd55de Restlye project sidebar a bit to make it more clear 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 19:38:53 +03:00
Dmitriy Zaporozhets 3b0cf49f33 Fix project description and avatar alignment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 19:25:18 +03:00
Dmitriy Zaporozhets 30c6dbe36d Show CI link on project home page only if CI enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 17:30:50 +03:00
Dmitriy Zaporozhets 040ee6f897 Reorganize elements in project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 16:45:53 +03:00
Dmitriy Zaporozhets 7da7a790fa Move clone panel to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 13:09:50 +03:00
Dmitriy Zaporozhets 4adac0b4be Remove unnecessary info from project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:49:49 +03:00
Dmitriy Zaporozhets 478a4b19da Turn sidebar in sections with contribute and repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:47:01 +03:00
Dmitriy Zaporozhets 3ce0557ab0 Move tabs with activity/readme to section 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:29:52 +03:00
Dmitriy Zaporozhets 31e5cd214e Move project section to own partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:26:27 +03:00
Dmitriy Zaporozhets 04e365ebb7 Move project sidebar to separate partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:23:25 +03:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Sullivan SENECHAL 5bc5188a06 Fix missing button types 2015-05-05 00:45:06 +02:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00