home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,916 Commits 48 Branches 340 Tags
522d754dfee9673befc7e6dc93c8a080eba7ae66
Commit Graph
11916 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 522d754dfe Try wear_merged! without argument 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-01 11:43:16 +03:00
Marin Jankovski 3dde6bb3fa Update changelog for 7.3.2 
Conflicts:
	CHANGELOG
 2014-10-01 09:57:10 +02:00
Marin Jankovski 2ac1f95ba1 Update guides to use gitlab-shell 2.0.1. 2014-10-01 09:56:04 +02:00
Marin Jankovski 0ca8505114 Update gitlab-shell to v2.0.1. 2014-10-01 09:55:47 +02:00
Dmitriy Zaporozhets 73b92f85bc Merge branch 'add_active_directory_ldap_option' into 'master' 
Add active directory ldap option

Fixes #1557

See merge request !1139
 2014-10-01 07:04:08 +00:00
Dmitriy Zaporozhets 88d3e97e50 Merge branch 'readme_tab' into 'master' 
Add Readme tab to project show page

Fixes #1533

See merge request !1140
 2014-10-01 06:32:40 +00:00
Dmitriy Zaporozhets 76aca721b7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-30 22:48:00 +03:00
Robert Schilling 654f949805 Merge pull request #7917 from mr-vinn/fix-alt-typo 
Fix typo in link title
 2014-09-30 20:30:02 +02:00
Vinnie Okada b7874c8520 Fix typo in link title 2014-09-30 13:04:13 -05:00
Robert Schilling 136d44550d Merge pull request #7914 from cirosantilli/patch-6 
Remove statement without effect.
 2014-09-30 19:09:08 +02:00
Robert Schilling b87c8c1a50 Merge pull request #7913 from cirosantilli/fix-dev-merge-seed 
Fix dev merge seed: update testme to gitlab-test.
 2014-09-30 18:05:26 +02:00
Ciro Santilli 0f12e051c0 Remove statement without effect. 2014-09-30 17:53:54 +02:00
Ciro Santilli 789b427592 Fix dev merge seed: update testme to gitlab-test. 2014-09-30 17:34:46 +02:00
Dmitriy Zaporozhets 8b362fbf39 Merge branch 'email_on_push_template_changes' into 'master' 
Email on push template changes

Fixes #1304

See merge request !1136
 2014-09-30 15:09:03 +00:00
Robert Schilling 88db8708b6 Merge pull request #7911 from cirosantilli/trailing-white 
Remove trailing whitespace from views.
 2014-09-30 17:05:10 +02:00
Ciro Santilli 6aa0448f76 Remove trailing whitespace from views. 2014-09-30 16:41:48 +02:00
Dmitriy Zaporozhets 2b88c9cd15 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 16:54:56 +03:00
Marin Jankovski ae88a9bfea Add readme tab to changelog. 2014-09-30 15:12:20 +02:00
Marin Jankovski 65cb51af31 Add a feature for readme on project show page. 2014-09-30 14:59:30 +02:00
Dmitriy Zaporozhets 6fa81e5d58 Add rspec to test_ci 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 15:55:03 +03:00
Dmitriy Zaporozhets 99a7bf8823 Separate rake test for simplecov 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 15:54:21 +03:00
Marin Jankovski 49157242ed Save if user prefers readme or activity tab. 2014-09-30 14:27:28 +02:00
Dmitriy Zaporozhets 0e183aa721 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-30 15:03:39 +03:00
Marin Jankovski 31e50ed3e4 Add tab for readme and load readme in tab. 2014-09-30 13:32:38 +02:00
Marin Jankovski ff2b0bfabd Merge branch 'speed-upgrade' into 'master' 
Speed upgrade

/cc @jacobvosmaer @dzaporozhets

See merge request !1134
 2014-09-30 10:20:18 +00:00
Marin Jankovski 7d45d8a14e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-30 12:16:27 +02:00
Dmitriy Zaporozhets a336f01b5c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-30 13:09:11 +03:00
Dmitriy Zaporozhets be34477d68 Merge branch 'backup_uploader_docs' into 'master' 
Improve backup uploader docs

See merge request !1137
 2014-09-30 10:08:53 +00:00
Marin Jankovski f7aba277e7 Add option to gitlab config to specify if LDAP server is active directory. 2014-09-30 12:07:31 +02:00
Jacob Vosmaer f778387e38 Add region to backup upload config in gitlab.yml 2014-09-30 12:05:07 +02:00
Jacob Vosmaer b5d2d3d799 Consolidate the IAM backup upload policy 2014-09-30 12:03:44 +02:00
Jacob Vosmaer 794078a32a Add a 'region' to the backup upload connection 2014-09-30 12:03:36 +02:00
Marin Jankovski 75eacf4d44 Update email templates for email on push service with links to commit and repository. 2014-09-30 11:28:43 +02:00
Dmitriy Zaporozhets adc84bf8b4 Merge pull request #7906 from mr-vinn/fix-graph-log 
Replace Gitlab::Git::GitStats
 2014-09-30 12:19:05 +03:00
Dmitriy Zaporozhets 0c29cb3451 Merge branch 'jubianchi-api/issues-filter-milestone' 2014-09-30 12:18:07 +03:00
Dmitriy Zaporozhets 4c52ff5184 Merge branch 'api/issues-filter-milestone' of https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-30 12:17:57 +03:00
Dmitriy Zaporozhets c20c2c8385 Merge branch 'fix-network-graph' into 'master' 
Fix network graph

Fix #1624

See merge request !1135
 2014-09-30 08:57:37 +00:00
Dmitriy Zaporozhets 3f739428a0 Merge branch 'prevent_notes_polling' into 'master' 
Prevent notes polling when there are not notes

See merge request !1132
 2014-09-30 08:57:21 +00:00
Dmitriy Zaporozhets e145f46a93 Fix contributors api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 11:56:48 +03:00
Dmitriy Zaporozhets 5601b87b31 Bump gitlab_git version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 11:34:19 +03:00
Sytse Sijbrandij b80e81eb28 Rename the speed upgrade file. 2014-09-30 10:29:11 +02:00
Sytse Sijbrandij 63033faa3a Remove notice that it hasn't been released yet. 2014-09-30 10:28:30 +02:00
Robert Schilling 57c0d9ec46 Merge pull request #7870 from mr-vinn/fix-notify-spec 
Update expected value in notify_spec
 2014-09-30 07:53:46 +02:00
Robert Schilling 5b5912f917 Merge pull request #7889 from cirosantilli/rm-def-project 
Remove def project from tests that inherit it.
 2014-09-30 07:42:30 +02:00
Vinnie Okada 31abf76840 Replace Gitlab::Git::GitStats 
The `GitStats` class has been removed from gitlab_git, so parse commits
directly in `Repository#graph_log`.
 2014-09-29 22:58:21 -05:00
Dmitriy Zaporozhets efcac2befc Merge pull request #7873 from cirosantilli/testme-to-gitlabtest 
Replace testme with gitlab-test.
 2014-09-29 19:49:59 +03:00
Jacob Vosmaer 693cee89f9 Prevent notes polling when there are not notes 2014-09-29 17:32:56 +02:00
Dmitriy Zaporozhets 9654cbb592 Merge branch 'backup-uploader' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-29 18:20:21 +03:00
Dmitriy Zaporozhets 804b25956e Merge branch 'protect_default_branch_by_default' into 'master' 
Protect default branch by default

Fixes #1543

See merge request !1130
 2014-09-29 15:16:15 +00:00
Dmitriy Zaporozhets 4e5989ea68 Merge branch 'keep_repositories_directory' into 'master' 
Keep repositories directory

See merge request !1131
 2014-09-29 15:12:50 +00:00