home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,498 Commits 48 Branches 340 Tags
d6444004e19df77f559e4db5b42ea56045da4690
Commit Graph
6498 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets d6444004e1 Merge branch '6-1-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-1-stable 2013-10-21 15:11:06 +03:00
Dmitriy Zaporozhets 0dd94f2215 Merge branch 'sidekiq_start_fix' of /home/git/repositories/gitlab/gitlabhq into 6-1-stable 2013-10-21 12:10:40 +00:00
Jacob Vosmaer 70563a780f Use built-in sidekiq deamonization 2013-10-18 11:19:20 +02:00
Jacob Vosmaer a02a4dfa37 Remove duplicate log path generation 2013-10-18 11:19:20 +02:00
Jacob Vosmaer 976185db97 Always shut down sidekiq before starting 2013-10-18 11:19:06 +02:00
Jacob Vosmaer b595503968 Merge pull request #5242 from earlonrails/patch-2 
Update app version in init script
 2013-10-02 08:17:37 -07:00
Kevin Krauss 650db83680 Update gitlab 2013-10-01 11:51:43 -07:00
Dmitriy Zaporozhets 82f3446fde Merge pull request #5174 from johannesbecker/service-pivotaltracker 
PivotalTracker Source Commits Endpoint
 2013-09-25 08:31:39 -07:00
Johannes Becker fa8588827e Syntax cleanup 2013-09-25 16:54:34 +02:00
Johannes Becker 64e012a378 Added spinach Tests for pivotaltracker service 2013-09-25 16:49:39 +02:00
Johannes Becker 435a5ff8a1 Remove not needed attr_accessible 2013-09-25 01:09:33 +02:00
Johannes Becker 35597f61aa Simple PivotalTracker Source Commits Service 2013-09-25 00:56:25 +02:00
Dmitriy Zaporozhets daf2cf62d7 Merge pull request #5163 from hiroponz/update-check-script-in-stable-branch 
Update check script in stable branch
 2013-09-24 00:20:34 -07:00
Hiroyuki Sato a5e19c4edc Update check script 
* GitLab Shell 1.7.1 is required
* Global projects are not supported (refs #5152)
 2013-09-24 15:32:56 +09:00
Dmitriy Zaporozhets e4ba9349a3 Merge pull request #5149 from hiroponz/fix-api-merge-request 
Fix API::MergeRequest in 6-1-stable
 2013-09-22 04:52:30 -07:00
Hiroyuki Sato b099951c55 Fix API::MergeRequest 
Refs #5145
 2013-09-22 18:46:42 +09:00
Dmitriy Zaporozhets 37a0e06354 Merge pull request #5109 from spudstud/6-1-stable 
Corrects the update document to match the version of gitshell specified ...
 2013-09-22 01:51:21 -07:00
Marin Jankovski dcf9abc1b1 Version 6.1.0 v6.1.0 2013-09-22 10:45:19 +02:00
Sytse Sijbrandij 731619ac5c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-09-21 18:55:28 +02:00
Sytse Sijbrandij 687cd9fa5b Update gitlab_git to version 2.3.1 2013-09-21 18:54:18 +02:00
Dmitriy Zaporozhets 09e4ecfbc6 Merge branch 'update_changelog' of /home/git/repositories/axil/gitlabhq 2013-09-21 08:01:52 +00:00
Axilleas Pipinellis ed68bf7ebf Add author of new init script 2013-09-19 16:36:37 +03:00
Sytse Sijbrandij 05ef996e52 README improved. Removed travis badge 2013-09-19 10:45:31 +02:00
Dmitriy Zaporozhets d4c4fc35a6 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2013-09-18 22:48:13 +00:00
Dmitriy Zaporozhets 540b3ee563 Merge pull request #5099 from yatishmehta27/gitignore-changes 
Added .ruby-version & .ruby-gemset in .gitignore
 2013-09-18 15:47:23 -07:00
Dmitriy Zaporozhets 6a8b9ed8d1 Merge branch 'changelog-specifics' of /home/git/repositories/gitlab/gitlabhq 2013-09-18 22:46:04 +00:00
Sytse Sijbrandij 300f2444a8 Add author and issue id warning. 2013-09-18 09:35:38 +02:00
Dmitriy Zaporozhets 8672203baf Merge pull request #5112 from hiroponz/drop-support-of-root-namespace 
Drop support of root namespace in model
 2013-09-17 23:57:17 -07:00
Dmitriy Zaporozhets 9fabd70323 Merge pull request #5117 from karlhungus/feature-password-update-skipped-when-ldap-user 
Don't show users password change page if ldap users
 2013-09-17 23:54:37 -07:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Spencer Owen fbd16e5420 Corrects the update document to match the version of gitshell specified in the install document (1.7.1) 2013-09-16 23:52:26 -06:00
Yatish Mehta 1b1c81b175 Added .ruby-version & .ruby-gemset in .gitignore 2013-09-16 19:19:04 +05:30
Dmitriy Zaporozhets 16b6040c2e Update docs to use 6-1-stable branch 2013-09-16 14:04:22 +03:00
Dmitriy Zaporozhets 9c629a1ebc Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare 2013-09-16 13:33:34 +03:00
Dmitriy Zaporozhets 2d31a9f345 Merge pull request #5093 from smashwilson/example-config-fix 
Fix issue_closing_regex in gitlab.yml.example
 2013-09-15 22:59:11 -07:00
Ash Wilson 8bbb5628c4 Don't quote the default issue closing regex. 
It turns out that regex escapes and YAML quoted-scalar escapes don't play
nicely together.
 2013-09-15 15:46:32 -04:00
Dmitriy Zaporozhets e0e88cddd8 Fix tests 2013-09-14 22:01:31 +03:00
Dmitriy Zaporozhets 90dc5ff5fd Fix 500 error on admin->project page 2013-09-14 21:18:01 +03:00
Dmitriy Zaporozhets 74a621385f Extend user infiormation displayed on admin user page 2013-09-14 20:55:33 +03:00
Dmitriy Zaporozhets a51562d6d9 Fix setting default values for user 2013-09-14 20:51:16 +03:00
Dmitriy Zaporozhets 3fe2558a5c Let it be 6.1.0.rc1 2013-09-14 18:25:42 +03:00
Dmitriy Zaporozhets 7311477e48 Update CHANGELOG with new entries for 6.1 2013-09-14 18:24:55 +03:00
Dmitriy Zaporozhets 9f2e19b064 Merge pull request #5084 from spudstud/patch-2 
Update unicorn.rb.example
 2013-09-14 08:09:36 -07:00
Dmitriy Zaporozhets 2898d92397 Merge pull request #4996 from hiroponz/drop-support-of-root-namespace 
[WIP]Drop support of root namespace in routing
 2013-09-14 07:47:41 -07:00
Dmitriy Zaporozhets df92d4ff67 Merge pull request #5072 from jbornschein/proj-new-public 
Add "public-project?" checkbox to new-project view
 2013-09-14 06:19:56 -07:00
Joerg Bornschein c71460d2d3 Use ruby 1.9 hash syntax 2013-09-14 13:28:15 +02:00
Dmitriy Zaporozhets c479b1dd1f Merge pull request #5051 from jbornschein/patch-1 
Minor UI fix in views/public/project/index.html.haml
 2013-09-14 00:17:24 -07:00
Dmitriy Zaporozhets 4ed9fde654 Merge pull request #5056 from lewtds/patch-1 
Fix typo in installation.md
 2013-09-14 00:17:14 -07:00
Dmitriy Zaporozhets 4f9098032c Remove code that was accidently added in 5dae40f579 2013-09-14 10:14:55 +03:00