home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,769 Commits 48 Branches 340 Tags
6-9-stable
Commit Graph
9769 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 8759577d24 Merge pull request #7119 from tensor-dev/improve-git-timeout-logging 
Improve git timeout logging
 2014-07-23 20:23:47 +03:00
Oleg Elifantiev dbefe90661 Fixed lint warnings 2014-06-12 13:51:09 +04:00
Oleg Elifantiev fc69264f42 Improve GitTimeout error logging 2014-06-12 13:38:16 +04:00
Marin Jankovski e46b644a88 Version to 6.9.2. v6.9.2 2014-05-30 10:57:31 +02:00
Marin Jankovski 08bd91a181 Add to changelog v6.9.2 2014-05-30 10:57:13 +02:00
Marin Jankovski d5ae2bfc5d Merge branch 'fix_ldap_user_filter' into '6-9-stable' 
Fix LDAP user filter
 2014-05-30 08:46:09 +00:00
Jacob Vosmaer 6d896ed5c2 Revert "Actually use the 'user_filter' configuration option" 
This reverts commit e9d4587ff1, which is
incompatible with GitLab's built in LDAP user filter: a GitLab LDAP
filter is [added on top of the other filters used to find the
user](https://gitlab.com/gitlab-org/gitlab-ce/blob/982d4d51e8110bec280eb00db0fb756b062103d9/lib/gitlab/ldap/adapter.rb#L61)

Example GitLab LDAP filter: `(memberOf=cn=foo,dc=bar)`.

In contrast, an omniauth-ldap filter [replaces the 'normal'
filters](https://gitlab.com/gitlab-org/omniauth-ldap/blob/76d77543dec0c585bb4e974262f43675f9810953/lib/omniauth/strategies/ldap.rb#L55)

Example omniauth-ldap user filter:
`(&(uid=%{username})(memberOf=cn=foo,dc=bar))`.
 2014-05-29 18:21:18 +02:00
Marin Jankovski 13202d828b Version to 6.9.1. v6.9.1 2014-05-27 09:22:17 +02:00
Marin Jankovski bfc561e486 Add missing lines in update guide. 2014-05-27 09:14:39 +02:00
Marin Jankovski de41e7a3da Replace jquery deprecated .live with .on 2014-05-27 09:12:57 +02:00
Dmitriy ZaporozhetsandMarin Jankovski 01b03a8191 Fix scroll to highlighted line. Replace scrollTO js file with gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 09:12:45 +02:00
Marin Jankovski f0a32c6949 Version to 6.9.0 v6.9.0 2014-05-22 11:10:02 +02:00
Marin Jankovski 4d095c3d0e Required shell version is now 1.9.4. 2014-05-22 11:01:32 +02:00
Sytse Sijbrandij 9f80ab8e75 Merge branch 'dev-setup-on-metal' into 'master' 
Dev setup on metal
 2014-05-21 11:06:40 +00:00
dosire 60053e6e2c It now is a metal dev install. 2014-05-21 13:06:12 +02:00
Dmitriy Zaporozhets f420ae4b18 Merge branch 'cloud-com' into 'master' 
Cloud com
 2014-05-21 10:02:19 +00:00
dosire 13761caead Fixed spelling mistake in readme with a whole room watching. 2014-05-20 20:51:35 +02:00
Jacob Vosmaer 3199ef079c Merge branch 'deploy-key-projects' into 'master' 
Deploy key in multiple projects

Add doc on adding a deploy key easily to multiple projects through the API.
 2014-05-20 16:19:09 +00: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 2e8f4bf392 Merge branch 'milestome-ui' into 'master' 
Improve Milestome UI

Milestone UI header was different from Issue/MR pages but use same UI elements.
This MR fixes it so UI looks same for issue/mr/milestone
 2014-05-20 13:30:42 +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
dosire ce8e7d280b Change cloud into .com 2014-05-20 14:30:25 +02:00
Dmitriy Zaporozhets 761fbbfeea Merge branch 'fix-install-guide' into 'master' 
Fix install guide

Fix gitlab setup. DB setup must go after gitlab-shell setup. Because in seeds we need `/home/git/repositories` to exist
 2014-05-20 09:10:37 +00:00
Dmitriy Zaporozhets c05117d9a2 Merge branch 'create_pg_indexes' into 'master' 
Rebuild Postgres indexes after a MySQL conversion
 2014-05-20 09:10:08 +00:00
Dmitriy Zaporozhets 5d77088202 Do gitlab:shell setup before seeds because we need /home/git/repositories exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 12:00:23 +03:00
Job van der Voort ea109704d1 everything in header 2014-05-19 20:35:59 +02:00
Jacob Vosmaer 6be0188b5c Rebuild indexes after a MySQL conversion 2014-05-19 17:51:58 +02:00
Jacob Vosmaer dca537ab29 Use the gitlabhq fork of the MySQL converter 2014-05-19 17:49:29 +02:00
Dmitriy Zaporozhets f08cb26487 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-19 15:48:52 +03:00
Dmitriy Zaporozhets eb06509a37 Merge branch 'ubuntu-14-needs-recent-ruby-patch' into 'master' 
Ubuntu 14 needs recent ruby patch
 2014-05-19 12:48:34 +00:00
dosire 126eefc5b8 Ruby version updated so it doesn't have the readline bug https://www.ruby-lang.org/en/news/2014/05/09/ruby-2-0-0-p481-is-released/. 2014-05-19 14:45:55 +02:00
Sytse Sijbrandij 0484f72c34 Merge pull request #6998 from pkallberg/master 
Added Cloud 66 to third party one-click installers
 2014-05-19 14:05:39 +02:00
Philip Källberg 50313b646d Removed exclamation mark for Cloud 66 installer 2014-05-19 12:55:56 +01:00
Philip Källberg 0202c98772 Added Cloud 66 to third party one-click installers 2014-05-19 12:45:52 +01:00
Dmitriy Zaporozhets 3a279bb2a9 Merge branch '6.9.0.rc1' into 'master' 
Version 6.9.0.rc1
 2014-05-19 10:37:47 +00: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
Marin Jankovski aacd43d72d 6.9.0 RC1 v6.9.0.rc1 2014-05-19 12:31:20 +02:00
Marin Jankovski 39d95b1d94 Update installation guide, create update guide. 2014-05-19 12:30:30 +02:00
Dmitriy Zaporozhets a85aa4e09e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-19 12:38:31 +03:00
Dmitriy Zaporozhets 1a068d7411 Merge branch 'logrotate_update_fix' into 'master' 
Clean up *.log.1 files during 6.6-to-6.7 upgrade
 2014-05-19 06:16:15 +00:00
Dmitriy Zaporozhets 386d998e79 Merge branch 'use_example_email' into 'master' 
Use example email in documents and example files

Fixes #1177
 2014-05-18 18:24:07 +00:00
Dmitriy Zaporozhets 764a269a1e Merge branch 'add-link-to-ee-jenkins' into 'master' 
Add link to ee jenkins

/cc @marin
 2014-05-18 18:23:32 +00:00
Dmitriy Zaporozhets ccbb2da71a Merge pull request #6990 from Scooletz/master 
.NET client introduced to docs
 2014-05-18 20:37:59 +03:00
dosire e1e9c307a6 Inform about the EE features. 2014-05-17 10:41:12 +02:00
Scooletz d7cee6ed76 .NET client introduced to docs 2014-05-17 00:04:09 +02: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 8fa47d0058 Merge branch 'improve-issue-box' into 'master' 
Improve issue box colors
 2014-05-16 11:43:36 +00:00
Marin Jankovski dbd88d453b Update the examples to example.com 2014-05-16 12:57:32 +02: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