home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,213 Commits 48 Branches 340 Tags
e2cd20cc723fed41d3dc2c696f94f9d117fc4174
Commit Graph
10213 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marvin Frick fcd27b761c changes display for empty brand_logo 2014-06-16 10:50:17 +02:00
Dmitriy Zaporozhets 09ffd67242 Merge branch 'jira_mentionable' into 'master' 
Fix JIRA issue reference bug
 2014-06-14 11:36:54 +00:00
Jacob Vosmaer 834b23a750 Fix JIRA issue reference bug 2014-06-13 18:24:30 +02:00
Dmitriy Zaporozhets f1d3289690 Merge branch 'master' of gitlab.com:subscribers/gitlab-ee 2014-06-13 18:12:40 +03:00
Dmitriy Zaporozhets aff9dadf6a Merge branch 'bug/jira_issue_closing' into 'master' 
Fix JIRA issue closing bug
 2014-06-13 15:12:03 +00:00
Jacob Vosmaer e496b14773 Add CHANGELOG-EE entry for JIRA bug 2014-06-13 15:40:33 +02:00
Jacob Vosmaer 83f01ab558 Test #issues_sentence with JiraIssues 2014-06-13 15:40:33 +02:00
Jacob Vosmaer 978162bb8a Add a test for issue sentence generation 2014-06-13 15:40:33 +02:00
Jacob Vosmaer 2ab1363c75 Test if JiraIssues make it through #issues_for 2014-06-13 15:40:33 +02:00
Jacob Vosmaer 68048e3009 Feed a JiraIssue to JiraService in its spec 2014-06-13 15:40:32 +02:00
Jacob Vosmaer 873127d6d0 Return JiraIssues in ReferenceExtractor#issues_for 2014-06-13 15:40:21 +02:00
Jacob Vosmaer d4ae3e4d82 Add a JiraIssue class 2014-06-13 15:40:09 +02:00
Dmitriy Zaporozhets bb5581b185 Merge branch 'ee_remove_auth_from_ci_url' into 'master' 
removes API credentials from link to CiServer build_page

In f1e3896334 @dblessing introduced the support to specify API credentials for a CiService (in this case Jenkins) via its URL. This lead to the state that for any MR a link is rendered which references the build result. This link however contains the provided API credentials which I don not believe to be intended!
Under this circumstances any user with access to the GitLab MR page can access the API token which may allow privileged access the CI server.

My MR changes the behavior of the appropriate helper method to remove the credentials from the link. It also adds a spec for it, so we do not suffer a regression later on.
 2014-06-11 15:17:55 +00:00
Marvin Frick d448f40763 removes api credentials from link to build_page 
Also adds a spec for MergeRequestHelper to avoid having a regression
later on.
 2014-06-11 12:41:14 +02:00
Jacob Vosmaer 2b9a9d4c32 Merge branch '6-9-ce-to-ee' into 'master' 
Add 6.9-ce-to-ee.md update doc
 2014-06-11 09:23:32 +00:00
Jacob Vosmaer 84cdd53358 Add 6.9-ce-to-ee.md update doc 2014-06-11 10:33:06 +02:00
Dmitriy Zaporozhets 766af5838f Merge branch 'add_aborted_status' into 'master' 
Jenkins Service - Add aborted status

Currently, Jenkins service will show "pending" build status even if the job has been aborted. This simple change allows the CI status to recognize an aborted status and mark it as a failure.
 2014-06-10 16:25:40 +00:00
Dmitriy Zaporozhets 6ab1e7992c Merge branch 'fix_jenkins_auth' into 'master' 
Fix jenkins auth

WebHooks currently support basic auth in the webhook URL - `http://user:pass@example.com`. With the Jenkins CI service the webhook is fired correctly when the project URL is in this format. However, the build status was unable to poll because auth was not used correctly.

This merge requests implements the basic auth strategy much the same as the web hook does. See https://gitlab.com/subscribers/gitlab-ee/blob/master/app/models/web_hook.rb#L34 for reference.
 2014-06-10 16:24:29 +00:00
Drew Blessing f6c8c6aa01 Recognize aborted job 2014-06-10 11:04:32 -05:00
Drew Blessing f1e3896334 Fix Jenkins Auth 2014-06-10 08:41:35 -05:00
Jacob Vosmaer 95cfe76818 Update 6.9.3 omnibus packages with OpenSSL 1.0.1h 2014-06-06 13:46:10 +02:00
Marin Jankovski 770f119979 Changelog for 6.9.3-ee 2014-06-04 12:01:42 +02:00
Marin Jankovski 83fb96b8a4 Merge branch 'release/6.9.3' into 'master' 
Release packages for 6.9.3-ee
 2014-06-04 08:49:06 +00:00
Marin Jankovski 8361faec57 Packages for 6.9.3-ee 2014-06-04 10:46:29 +02:00
Dmitriy Zaporozhets 29e9c41fa7 Merge branch 'single-copyright-license' into 'master' 
Single copyright license
 2014-06-02 14:47:20 +00:00
GitLab 19a8b6ce71 Remove copyright licenses missed in 0fdab6a747. 2014-06-02 09:11:24 +02:00
Marin Jankovski abd55836ea Merge branch 'release/6-9-2' into 'master' 
Release 6.9.2-ee
 2014-05-30 11:06:49 +00:00
Marin Jankovski 5fa80fa9b0 Packages for 6.9.2-ee 2014-05-30 13:05:46 +02:00
Marin Jankovski 5782730dab Version up to 6.9.2-ee 
Conflicts:
	CHANGELOG-EE
	VERSION
 2014-05-30 12:34:26 +02:00
Jacob Vosmaer 4eb5766dd9 Merge branch 'new_6_8_packages' into 'master' 
New 6.8 packages
 2014-05-29 12:55:17 +00:00
Jacob Vosmaer 4f049c8845 Release new EE 6.8.1 packages 
The old packages were having issues with gitlab-shell.
 2014-05-29 14:53:15 +02:00
Dmitriy Zaporozhets e8cc260eb2 Merge branch 'license-update' into 'master' 
License update
 2014-05-29 12:53:09 +00:00
Sytse Sijbrandij c2a9915539 Merge branch 'ci-changes-are-in-master' into 'master' 
Ci changes are in master
 2014-05-28 15:06:02 +00:00
dosire c365292e98 Changes are merged in 5580dc999b. 2014-05-28 17:05:23 +02:00
dosire 51a5ffb2c0 Update license. 2014-05-28 09:59:45 +02:00
Marin Jankovski ecb13b38c4 Merge branch '6-9-1-packages' into 'master' 
6.9.1 packages
 2014-05-27 10:17:10 +00:00
Marin Jankovski af529b4667 Packages for 6.9.1 2014-05-27 12:16:24 +02:00
Marin Jankovski 37e2fb81c2 Link jira doc to integration readme. 2014-05-23 13:03:10 +02:00
Jacob Vosmaer 7c0b84af5e Update 6.9.0-ee Debian packages 2014-05-22 19:10:38 +02:00
Marin Jankovski c5d833f06e Fix version 2014-05-22 15:58:26 +00:00
Marin Jankovski dc5cb4be24 Merge branch '6-9-packages' into 'master' 
6.9.0 EE packages
 2014-05-22 13:51:32 +00:00
Marin Jankovski 6e3d1f929d Packages for EE 6.9.0 2014-05-22 13:20:05 +02:00
Sytse Sijbrandij 33bfe3c175 Merge branch 'change-image-reference' into 'master' 
Change image reference
 2014-05-22 10:04:55 +00:00
dosire 56381ce6c4 Forgot to change the image reference. 2014-05-22 12:04:28 +02:00
Sytse Sijbrandij 534b9a177c Merge branch 'no-jpg' into 'master' 
No jpg
 2014-05-22 10:01:12 +00:00
dosire 71b0809837 jpg images are not supported by doc-gitlab-com 2014-05-22 12:00:45 +02:00