home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,213 Commits 48 Branches 340 Tags
e2cd20cc723fed41d3dc2c696f94f9d117fc4174
Commit Graph
5095 Commits
Author SHA1 Message Date
Marvin Frick fcd27b761c changes display for empty brand_logo 2014-06-16 10:50:17 +02: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
Jacob Vosmaer 978162bb8a Add a test for issue sentence generation 2014-06-13 15:40:33 +02:00
Jacob Vosmaer d4ae3e4d82 Add a JiraIssue class 2014-06-13 15:40:09 +02: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
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
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
GitLab 19a8b6ce71 Remove copyright licenses missed in 0fdab6a747. 2014-06-02 09:11:24 +02:00
Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb
 2014-05-21 13:10:37 +02:00
Dmitriy Zaporozhets d52a3281dc Merge branch 'small-ui-improvements' into 'master' 
Small ui improvements

* fix ugly errors block when admin save invalid user
* fix ugly errors when you tries to save invalid wiki page
 2014-05-20 15:44:45 +00:00
Dmitriy Zaporozhets 1a4c9118ae Fix UI for wiki error message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:22:47 +03:00
Dmitriy Zaporozhets 9eb7fe6d06 Fix admin user errors ui 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:21:30 +03:00
Dmitriy Zaporozhets 85c5a20352 Small UI change to milestone page so it looks similar to issue/mr 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-19 13:34:26 +03:00
Dmitriy Zaporozhets 6dfd88a145 Merge branch 'fix-group-members-search' into 'master' 
Fix group members search

Postgres only.
500 error when try to search group members on `/groups/:group_id/members` page
 2014-05-16 11:43:58 +00:00
Dmitriy Zaporozhets 52bd8d4066 Improve issue box colors. Move colors to variables for future reuse 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-16 13:47:34 +03:00
Dmitriy Zaporozhets 85cecc0b2e Fix 500 error on group members search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-16 13:28:35 +03:00
Dmitriy Zaporozhets a3a512f2ef Hide group dashboard and project sidebar for xs size 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 16:30:50 +03:00
Dmitriy Zaporozhets 0505a88299 Hide control elements and last login for xs display 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 16:30:21 +03:00
Dmitriy Zaporozhets 90342c9e9e Add help section for services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 11:28:01 +03:00
Dmitriy Zaporozhets afe1ff413d Specify project URL for Jenkins service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 11:20:25 +03:00
Dmitriy Zaporozhets b16d77c3e0 Make it easier to add CI services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 11:14:43 +03:00
Dmitriy Zaporozhets cce27a6a00 Add parent CiService class for easy add of new services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 11:06:17 +03:00
Dmitriy Zaporozhets e6d2c02e67 Dirty implementastion of MR build status for Jenkins 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 10:34:35 +03:00
Dmitriy Zaporozhets 84b355077f Add Jenkins CI service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-14 16:57:31 +03:00
Marin Jankovski 01a3f830c1 Add template only on new MR create page. 2014-05-14 15:24:38 +02:00
Marin Jankovski 7478ece8b4 Add template for merge request descriptions to projects. 2014-05-14 15:24:14 +02:00
Evgeniy Sokovikov 24b68fdada fix ctrl+enter note send 
use argument e instead of event
 2014-05-14 13:13:05 +04:00
Marin Jankovski 92917d89ee Add needed spaces. 2014-05-14 09:45:40 +02:00
Dmitriy Zaporozhets c91300e4ce Remove text-shadow from header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 19:55:03 +03:00
Dmitriy Zaporozhets d57889212b Green theme instead of dark 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 18:41:36 +03:00
Dmitriy Zaporozhets b787540f71 Change diff header bg 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 16:40:08 +03:00
Dmitriy Zaporozhets caa876af90 Improve file title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 16:01:13 +03:00
Dmitriy Zaporozhets 51280fc76c Improve violet theme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 15:15:46 +03:00
Marin Jankovski e2d4ee91bd Add tests and documentation for jira service. 2014-05-13 13:48:55 +02:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Marin Jankovski e3f736d258 Add Jira service. 2014-05-13 12:12:16 +02:00
Dmitriy Zaporozhets 17858d49f6 Merge pull request #6109 from jamit/master 
Added email threading for update emails on issues and merge requests
 2014-05-13 12:35:33 +03:00
Dmitriy Zaporozhets 3ea4bf4891 Merge pull request #6045 from jacargentina/fix-4305 
Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
 2014-05-13 12:29:54 +03:00
Dmitriy Zaporozhets 0401e19558 Merge pull request #6385 from cirosantilli/72-char-commit-msg 
Commit message textareas have 72 char mark line.
 2014-05-13 12:29:28 +03:00
Dmitriy Zaporozhets 0fd12a786a Merge pull request #6825 from sue445/feature/post_automerge 
Fix can not automerge when description is too long
 2014-05-13 12:26:42 +03:00
Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml
 2014-05-12 12:39:51 +03:00
Alex 31b0e14981 Adding project visibility to system hooks 2014-05-12 10:23:24 +01:00
sue445 a3d8be09c6 Fix can not automerge if description is too long 2014-05-11 23:50:14 +09:00
Gregoire Daussin ea696805a7 Fix css rules conflict between .dark & a.dark classes 2014-05-09 17:58:23 +02:00
Dmitriy Zaporozhets 23ae3911aa Merge branch 'mixin-cleanup' into 'master' 
Mixin cleanup

* Remove old mixins
* add issue box shadow
* change color for network graph box
 2014-05-08 20:01:52 +00:00
Dmitriy Zaporozhets 058c48845b Merge branch 'fix_merge_request_emails' into 'master' 
Remove markdown syntax from notification emails

Merge request notifications once again gained markdown syntax 😄 In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c5 and it was recently changed back to use the markdown style.
 2014-05-08 18:36:32 +00:00
Dmitriy Zaporozhets 4ca1a29de8 Merge pull request #6934 from skv-headless/ctrl_enter_form_submit 
submit notes forms by pressing ctrl+enter
 2014-05-08 21:31:25 +03:00