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,765 Commits 48 Branches 340 Tags
e677ef34b9709bf900955ee37d81ff83dc2ef2db
Commit Graph
10765 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer e677ef34b9 Add 6.9.4-ee packages with Postgres security fix 2014-06-19 13:13:30 +02:00
Marin Jankovski 484819063c Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
 2014-06-19 09:22:51 +02:00
Dmitriy Zaporozhets b64351478a Merge branch 'revert_email_thread' into 'master' 
Revert email threading rewrite

The 'to:' address introduced by this merge caused a flood of email going to an admin account for GitLab.com. This feature should not be shipped as-is.
 2014-06-19 06:28:37 +00: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 67934145e8 Merge pull request #7146 from zzet/patch-11 
Fix mistake in reference_jira_issue method (markdown)
 2014-06-18 18:12:54 +03:00
Jacob Vosmaer 780d868fec Revert "Merge branch 'fix-email-threading' into 'master'" 
This reverts commit 97fd990ecd, reversing
changes made to f451a697e0.

Conflicts:
	app/mailers/emails/notes.rb
	app/mailers/emails/projects.rb
 2014-06-18 13:41:12 +02:00
Dmitriy Zaporozhets c1ff1fdeff Merge branch 'show-them' into 'master' 
Improve the spelling on the project settings page
 2014-06-18 11:33:18 +00:00
Sytse Sijbrandij ca1248fb2e Spelling, needs to end the sentence. 2014-06-18 13:27:55 +02:00
Sytse Sijbrandij af67d58fa4 Spelling, you're showing the settings. 2014-06-18 13:24:49 +02:00
Dmitriy Zaporozhets ffa009dc34 Merge branch '7-0-update-guide' into 'master' 
7.0 update guide
 2014-06-18 10:56:27 +00:00
Dmitriy Zaporozhets f299301cfe Update guide from 6.9 to 7.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 13:35:31 +03:00
Dmitriy Zaporozhets 840e98ba87 Merge branch 'update-guide-7-0' into 'master' 
Installation guide for 7.0

* Changed branch to 7-0-stable
* Bump gitlab-shell version to 1.9.6
 2014-06-18 10:17:10 +00:00
Dmitriy Zaporozhets 39100513f3 Merge branch 'branded_login_page_documentation' into 'master' 
Branded login page documentation
 2014-06-18 10:06:30 +00:00
Dmitriy Zaporozhets 2b6b07f31e Bump shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 13:05:33 +03:00
Marin Jankovski 2592159ce1 Add branded login page doc to the main documentation README> 2014-06-18 11:56:56 +02:00
Dmitriy Zaporozhets 8f8a6bf2c2 Point to 7-0-stable in installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 12:54:54 +03: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
Andrew Kumanyaev 45f9d15c0e Fix mistake in reference_jira_issue method 
Use local variable instead global
 2014-06-18 11:11:09 +04:00
Jacob Vosmaer 6addc8c1eb Add Marvin Frick (SinnerSchrader) to CHANGELOG-EE 2014-06-17 15:10:15 +02:00
Dmitriy Zaporozhets 70ed6ef2a6 7.0.0.rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.0.0.rc1 		2014-06-17 15:48:43 +03: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