home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +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
Douwe Maan 85af3e82bf Add option to disable code diffs to EmailOnPush. 
See #1950
 2015-02-25 14:29:49 +01:00
Douwe Maan 0e7d1fd44f Add optional title field to service properties. 2015-02-25 14:05:03 +01:00
Douwe Maan 7b34c9dc59 Add list of changed files to EmailsOnPush. 
See #1906.
 2015-02-25 13:40:05 +01:00
Douwe Maan 6afb03ee96 Remove incorrect footer from EmailsOnPush body. 
See #1754.
 2015-02-25 13:13:46 +01:00
Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/controllers/files_controller.rb
 2015-02-25 11:59:25 +01:00
Dmitriy Zaporozhets a30a56634d Merge branch 'refactor-header' into 'master' 
UI: refactor header css

See merge request !1591
 2015-02-25 07:56:28 +00:00
Dmitriy Zaporozhets 878e86bf64 Remove unnecessary theme_type from body class 2015-02-24 23:26:32 -08:00
Dmitriy Zaporozhets 6e559be6c6 Refactor header logo and setup expectation on it size 2015-02-24 22:58:47 -08:00
Dmitriy Zaporozhets f43c0429c2 Improve admin projects and users pages for mobile devices 2015-02-24 21:31:54 -08:00
Dmitriy Zaporozhets 53784fb637 Merge branch 'master' into 'master' 
Updated Gitorious import icons

See merge request !353
 2015-02-24 21:17:11 +00:00
Dmitriy Zaporozhets 037a981017 Merge branch 'sidebar_state_toggle' into 'master' 
Toggle sidebar button more obvious

The toggle is now at the top of the sidebar because it is not noticeable
near the bottom. By placing it at the top, users will immediately know that
they can have more space if they desire versus on the bottom, they will have
to search for it and that's not desired.

Fixes #2044

See merge request !1579
 2015-02-24 20:49:31 +00:00
Sabba Petri 1e42cd2040 Added a warning class to button 
Because changing username largely affects the application, it should
not be green, but be more of a warning change, which is why it's now
orange.
 2015-02-24 10:09:38 -08:00
Sabba Petri 8bcff0f1c1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into button_changes 2015-02-24 10:07:17 -08:00
Sabba Petri a33e615b47 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into small_profile_changes 2015-02-24 09:55:25 -08:00
Sabba Petri 5b6d6bbc19 Added square caret to Back to Settings button 
This was done to show difference between Open/Close toggle, which
was using the same arrow as Back to Settings button previously.
 2015-02-24 09:42:35 -08:00
Sabba Petri 7f200b7d18 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into sidebar_state_toggle 2015-02-24 09:41:10 -08:00
Douwe Maan 46bcf40b2c Add ".org" back to Gitorious mentions. 2015-02-24 15:08:42 +01:00
Douwe Maan bc80efb1fd Bring Gitorious import page in line with others. 2015-02-24 15:07:25 +01:00
Douwe Maan 20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Douwe Maan a938b3eeb4 Link to original repo on import status pages. 2015-02-24 15:07:24 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00
Valery Sizov 71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
Marcin Kulik f6add983d3 Use proper Gitorious icons on import pages 2015-02-24 09:42:07 +00:00
Marin Jankovski 7561b1c2a4 Merge branch 'profile_tooltip_addition' into 'master' 
Added Profile tooltip

For consistency sake, the profile in the navbar has a tooltip.

Fixes #2007

See merge request !1572
 2015-02-24 08:06:22 +00:00
Dmitriy Zaporozhets 8b9348e80d Merge branch 'improve-sidebar' into 'master' 
Improve sidebar menu for project settings

See merge request !1582
 2015-02-24 07:46:03 +00:00
Douwe MaanandMarin Jankovski c9829146f8 LDAP users don't need to set a password to Git over HTTP. 2015-02-23 20:04:18 -08:00
Dmitriy Zaporozhets 12589d3390 Improve sidebar menu for project settings 2015-02-23 18:43:39 -08:00
Sabba Petri cb65a3f1d9 Changed button styles 
Styles for buttons are changed to match user expectations.
 2015-02-23 15:48:00 -08:00
Sabba Petri b3fd0ca04d Toggle sidebar button more obvious 
The toggle is now at the top of the sidebar because it is not noticeable
near the bottom. By placing it at the top, users will immediately know that
they can have more space if they desire versus on the bottom, they will have
to search for it and that's not desired.

Fixes #2044
 2015-02-23 14:27:52 -08:00
Sabba Petri 5ce2d44b13 Added Profile tooltip 
For consistency sake, the profile in the navbar has a tooltip.
 2015-02-23 11:51:18 -08:00
Sabba Petri 846f831774 Fixes grammatical consistency and small changes 
This commit adds consistency to small things like periods, commas,
etc. Also gives additional information to buttons and headers.
Fixes #2002, #2005, #2003
 2015-02-23 10:40:06 -08:00
Marco Wessel 48eeb006f0 Correct spelling of 'a project avatar' 2015-02-23 15:10:56 +01:00
Dmitriy Zaporozhets 19327e6535 Fix dashboard for projects > 30 2015-02-22 22:06:43 -08: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
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
Marcin Kulik 157b4b4b1f Add gitorious.org importer 2015-02-20 17:42:58 +00: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
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 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