home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,756 Commits 48 Branches 340 Tags
3de79957bca7b28246801550e4cdec26fac552fa
Commit Graph
10756 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 3de79957bc Spell fix 2014-06-20 06:46:01 +00:00
Dmitriy Zaporozhets 702eb461bd more spelling fixes 2014-06-19 14:11:16 +00:00
Dmitriy Zaporozhets 5e13013847 More spelling fixes 2014-06-19 13:42:01 +00:00
Dmitriy Zaporozhets 9bd8aac16f newline on every sentence + fixes 2014-06-19 13:29:52 +00:00
Dmitriy Zaporozhets 58ff82c8b3 More explanation for git_hooks feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 19:21:37 +03:00
Dmitriy Zaporozhets 0c8882f981 Explain Git Hooks feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 19:06:20 +03:00
Dmitriy Zaporozhets 9ef1897826 Fix tab highlight for git_hooks page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 19:05:45 +03:00
Dmitriy Zaporozhets 39100513f3 Merge branch 'branded_login_page_documentation' into 'master' 
Branded login page documentation
 2014-06-18 10:06:30 +00:00
Marin Jankovski 2592159ce1 Add branded login page doc to the main documentation README> 2014-06-18 11:56:56 +02:00
Marin Jankovski 300b7c19ea Move the branded login page documentation to customization directory. 2014-06-18 11:51:44 +02:00
Marin Jankovski 0c51f13a84 Add branded login page documentation. 2014-06-18 11:33:16 +02:00
Jacob Vosmaer 6addc8c1eb Add Marvin Frick (SinnerSchrader) to CHANGELOG-EE 2014-06-17 15:10:15 +02:00
Dmitriy Zaporozhets 68b32f3bcb Merge branch 'ce-7-to-ee' into 'master' 
Pull recent master from CE into EE

Fixes #113
 2014-06-17 10:09:18 +00:00
Dmitriy Zaporozhets 30654f8d83 remove duplicate steps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 12:14:17 +03:00
Dmitriy Zaporozhets 216e5fca0c Fix 500 on appearance page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 11:30:51 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets e44e2316c3 Change gravatar tests to identicon 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 09:40:48 +03:00
Dmitriy Zaporozhets 7be80fd899 Enable identicon for gravatar by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 09:27:50 +03:00
Dmitriy Zaporozhets 085a93d4a5 Replace ok with circle for boolean icon 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 22:31:15 +03:00
Dmitriy Zaporozhets 6a73124df2 Merge branch 'consistent-headers' into 'master' 
Consistent headers
 2014-06-16 14:43:21 +00:00
Dmitriy Zaporozhets 547ea3c80d Merge branch 'kanban-fixes' into 'master' 
Kanban improvements

When drag from unassigned to assigned column - issue assignee avatar updated
 2014-06-16 14:43:07 +00:00
Dmitriy Zaporozhets 3e3396365d Update gitlab_meta gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 17:25:45 +03:00
Dmitriy Zaporozhets a6549118b5 Dont install production gems for travis 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 17:23:38 +03:00
Dmitriy Zaporozhets 0014326ded Small UI fix 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 14:26:38 +03:00
Dmitriy Zaporozhets e2cd20cc72 Merge branch 'ee_empty_brand_image' into 'master' 
empty brand image are displayed as empty image_tag on login page

When using a custom appearance without uploading an image, an empty HTML img-tag is rendered, showing up badly in some browsers: http://i.imgur.com/EN9WpuA.png
Also, the empty img-tag was rendered in the admin/appearance form.
 2014-06-16 10:12:11 +00:00
Sytse Sijbrandij 4ea7b192d4 Use same size headers. Add PullReview. Mention shell guide as created by us. 2014-06-16 12:08:23 +02:00
Marin Jankovski 63df2fa62d Version 6.9.4 ee. 
Conflicts:
	VERSION
 2014-06-16 11:58:32 +02:00
Marin Jankovski 2710cb6549 Merge branch 'release/6.9.4-ee' into 'master' 
Release 6.9.4-ee
 2014-06-16 09:55:53 +00:00
Marin Jankovski d4a1b4c5bf Packages for 6.9.4-ee 2014-06-16 11:54:27 +02:00
Dmitriy Zaporozhets 8d240fb0e7 Show/hide issue assignee avatar depends on drag-n-drop column in milestone view 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 12:17:34 +03:00
Dmitriy Zaporozhets 9220e3ef18 Merge branch 'consistent-readme' into 'master' 
Consistent readme
 2014-06-16 09:06:40 +00:00
Sytse Sijbrandij 89ed1e09bb Clean up the readme. 2014-06-16 10:52:21 +02:00
Marvin Frick fcd27b761c changes display for empty brand_logo 2014-06-16 10:50:17 +02:00
Sytse Sijbrandij f31f101d36 Merge pull request #6831 from pkill/better-email-on-push-subject 
Provide better email subject lines from email on push service
 2014-06-16 08:21:46 +02:00
Alex Elman e6722cb178 Provide better email subject lines from email on push service 
If one commit is pushed, display the commit message in the subject
line. Otherwise display the number of commits pushed to the repository.
 2014-06-15 09:53:00 -05:00
Sytse Sijbrandij 46e33ed371 Merge pull request #7132 from pkgr/pkgr 
Enable CentOS packaging.
 2014-06-15 14:33:51 +02:00
Dmitriy Zaporozhets d74bf464d3 Postgres requires not-null value for boolean field 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-15 09:40:24 +03:00
Dmitriy Zaporozhets dbb7610365 Merge branch 'responsive-sidebar' into 'master' 
Responsive sidebar fixes

This fixes two major issues with the responsive sidebar

1. Overlapping content by the label:
The label and sidebar is now always on the right side of the screen. This makes it always easy to find (better UX) and prevents it from overlapping most content. Additionally, on xs screens, instead of the side-attached label, for some pages it will show an extra button in the head instead of a buttons that overlaps.

2. Pop up of sidebar on changing pages.
 2014-06-15 06:02:12 +00:00
Dmitriy Zaporozhets 8000fb44b7 Merge branch 'file-mode-changed' into 'master' 
Show file mode changes on commit page

## Before:

![Screenshot 2014-06-14 22.55.18](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/3f89dfa841/Screenshot_2014-06-14_22.55.18.png)

## After:

![Screenshot 2014-06-14 22.54.11](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/5e7550d595/Screenshot_2014-06-14_22.54.11.png)
 2014-06-14 20:47:55 +00:00
Job van der Voort 204fee4f41 move all sidebars to one side for improved UX; add button in head of projects/issues and milestones instead of tab on side of screen to prevent overlapping of content 2014-06-14 22:44:23 +02:00
Dmitriy Zaporozhets d29bb23a68 Update gitlab-grit to newer version with normal diff collection. Show if file mode was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 22:54:56 +03:00
Dmitriy Zaporozhets b48bb4a77c Change mode for view files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 20:35:40 +03:00
Dmitriy Zaporozhets 9e21e96b2a Fix dashboard "show more project" link padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 20:33:12 +03:00
Dmitriy Zaporozhets 72f0a6b286 Fix blob breadcrumb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 20:01:56 +03:00
Dmitriy Zaporozhets 56cb6d8899 Fix help css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:58:54 +03:00
Dmitriy Zaporozhets 52b7fa248a Darker color for page title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:55:26 +03:00
Dmitriy Zaporozhets 869809a1cf Remove failing test on travis+pg 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:41:32 +03:00
Dmitriy Zaporozhets 3637d244be Improve network UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:35:45 +03:00
Dmitriy Zaporozhets 951279b1a3 Improve tree view for iPad 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:09:36 +03:00
Dmitriy Zaporozhets 55795b7c29 Improve breadcrumbs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:02:16 +03:00