home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,017 Commits 48 Branches 340 Tags
5e89354fe605f8b6ed5b2db47935be76876dfd3e
Commit Graph
10017 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 5e89354fe6 Fix for test with new form of MR. 2014-05-15 13:39:27 +02:00
Dmitriy Zaporozhets 0ba4dc11f2 Merge branch 'jenkins-service' into 'master' 
Jenkins service

Show build status on MergeRequest page.
Requires GitLab Hook plugin to be installed in Jenkins
 2014-05-15 09:45:15 +00: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 0b259abeb4 Merge branch 'man-rake-check' into 'master' 
Man rake check

Related to: https://dev.gitlab.org/gitlab/organization/issues/12

In a previous release, it happened that the check was not yet updated, eventhough an updated GitLab Shell version was recommended.
 2014-05-15 06:36:19 +00: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
Dmitriy Zaporozhets 48311f05c7 Merge branch 'template_for_merge_request_description' into 'master' 
Template for merge request description
 2014-05-14 13:25:09 +00:00
Marin Jankovski 01a3f830c1 Add template only on new MR create page. 2014-05-14 15:24:38 +02:00
Marin Jankovski da461cd38c Add to changelog. 2014-05-14 15:24:38 +02:00
Marin Jankovski 9ff69c4c4b Add tests for template mr description. 2014-05-14 15:24:14 +02:00
Marin Jankovski 7478ece8b4 Add template for merge request descriptions to projects. 2014-05-14 15:24:14 +02:00
Dmitriy Zaporozhets ccff105129 Merge branch 'jira_service' into 'master' 
Close Jira issues with commit messages and merge requests
 2014-05-14 13:20:13 +00:00
Marin Jankovski 92917d89ee Add needed spaces. 2014-05-14 09:45:40 +02:00
Marin Jankovski 2be9425565 Add jira service to changelog. 2014-05-13 16:47:47 +02:00
Marin Jankovski e2d4ee91bd Add tests and documentation for jira service. 2014-05-13 13:48:55 +02:00
Marin Jankovski e3f736d258 Add Jira service. 2014-05-13 12:12:16 +02:00
Jacob Vosmaer fcc3200273 Merge branch '6-8-1' into 'master' 
6 8 1 packages
 2014-05-12 15:43:01 +00:00
Job van der Voort 76e09a3f5a 6.8.1 packages 2014-05-12 17:30:18 +02:00
Dmitriy Zaporozhets a03f59d53c Merge branch 'ce-6-9' into 'master' 
Upstream 6.9.0.pre CE to EE
 2014-05-12 12:30:43 +00: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
Dmitriy Zaporozhets 09ebd837c9 Merge branch 'update_rails_version' into 'master' 
Update rails version to 4.0.5
 2014-05-12 06:14:44 +00:00
Dmitriy Zaporozhets c355b9abfe Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict 
Fix css rules conflict between .dark & a.dark classes
 2014-05-11 20:36:16 +03:00
Dmitriy Zaporozhets 4ba5acd238 Merge branch 'link-to-installation-doc' into 'master' 
Link to installation doc
 2014-05-10 18:34:19 +00:00
dosire 049b63473f Link to the installation doc so people viewing on other locations can click the link. 2014-05-09 19:34:25 +02:00
Gregoire Daussin ea696805a7 Fix css rules conflict between .dark & a.dark classes 2014-05-09 17:58:23 +02:00
Jacob Vosmaer 9490abf4f2 Merge branch 'ldap_scoping' into 'master' 
Restrict LDAP scope in dn_matches_filter
 2014-05-09 14:07:39 +00:00
Marin Jankovski d9c0ecdca8 Add scope to dn filter. 2014-05-09 14:51:29 +02:00
Job van der Voort b5b7a400a3 add manual check of rake tasks 2014-05-09 11:56:44 +02:00
Dmitriy Zaporozhets 3b34084bde Fix notify specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-09 09:46:23 +03:00
Dmitriy Zaporozhets b8115e76a4 Merge branch 'backup_wiki_skip_bug' into 'master' 
Fix wiki backup skip bug
 2014-05-09 06:40:19 +00:00
Jacob Vosmaer 0f29ccffd2 Backup wiki repo even if the main repo is empty 
This fixes a bug where wiki repositories for projects with an empty main
repository would not get backed up.
 2014-05-08 22:50:48 +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 9e11153721 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-08 21:50:14 +03:00
Dmitriy Zaporozhets 32875f9aaf Merge pull request #6937 from chamill/master 
Provide fallback for missing `name` value.
 2014-05-08 21:49:59 +03: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 8c1201efac Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-08 21:31:43 +03: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
Dmitriy Zaporozhets aa5f306d11 Merge pull request #6860 from hszcg/dev 
Add support for side-by-side inline comments
 2014-05-08 21:23:44 +03:00
Dmitriy Zaporozhets cb20ab0201 Merge pull request #6929 from asedge/fix_api_branches_with_periods 
Add fix for API when branch names have periods in them.  Relates to issu...
 2014-05-08 21:22:13 +03:00
Dmitriy Zaporozhets 1ba865c6a6 Merge branch 'master' into 'master' 
Added Laravel API Wrapper
 2014-05-08 18:21:49 +00:00
Dmitriy Zaporozhets 4d11a3d8cd Merge pull request #6941 from jvanbaarsen/typo-fix 
Fix a minor typo in the README
 2014-05-08 21:21:13 +03:00
Dmitriy Zaporozhets 211e975d8a Change header color in network page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 21:10:20 +03:00
Dmitriy Zaporozhets 2ec1a879f7 Add box shadow to issue box 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 21:10:07 +03:00
Dmitriy Zaporozhets 20be9ef251 Remove old mixins 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 21:09:51 +03:00
Dmitriy Zaporozhets 5218537c3b Merge branch 'rails_4_0_5' into 'master' 
Rails 4.0.5
 2014-05-08 17:30:43 +00:00
Dmitriy Zaporozhets e5de006845 Merge branch 'tar_version_encoding' into 'master' 
Fix tar version string encoding bug
 2014-05-08 16:24:16 +00:00
Jacob Vosmaer da347d1bb4 Apply the locale encoding to tar --version 
Fixes a bug with non-UTF8 locales introduced by
2b816075dc.
 2014-05-08 18:23:44 +02:00