summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version to 6.9.2.v6.9.26-9-stableMarin Jankovski2014-05-301-1/+1
|
* Add to changelog v6.9.2Marin Jankovski2014-05-301-0/+3
|
* Merge branch 'fix_ldap_user_filter' into '6-9-stable'Marin Jankovski2014-05-301-2/+1
|\ | | | | | | Fix LDAP user filter
| * Revert "Actually use the 'user_filter' configuration option"Jacob Vosmaer2014-05-291-2/+1
|/ | | | | | | | | | | | | | | This reverts commit e9d4587ff11c8510f01dfa184414f73d75b4550b, 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))`.
* Version to 6.9.1.v6.9.1Marin Jankovski2014-05-272-1/+5
|
* Add missing lines in update guide.Marin Jankovski2014-05-271-0/+6
|
* Replace jquery deprecated .live with .onMarin Jankovski2014-05-271-1/+1
|
* Fix scroll to highlighted line. Replace scrollTO js file with gemDmitriy Zaporozhets2014-05-275-227/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Version to 6.9.0v6.9.0Marin Jankovski2014-05-222-1/+2
|
* Required shell version is now 1.9.4.Marin Jankovski2014-05-221-1/+1
|
* Merge branch 'dev-setup-on-metal' into 'master'Sytse Sijbrandij2014-05-211-1/+1
|\ | | | | | | Dev setup on metal
| * It now is a metal dev install.dosire2014-05-211-1/+1
|/
* Merge branch 'cloud-com' into 'master'Dmitriy Zaporozhets2014-05-211-1/+1
|\ | | | | | | Cloud com
| * Fixed spelling mistake in readme with a whole room watching.dosire2014-05-201-1/+1
| |
| * Change cloud into .comdosire2014-05-201-1/+1
| |
* | Merge branch 'deploy-key-projects' into 'master'Jacob Vosmaer2014-05-201-0/+25
|\ \ | | | | | | | | | | | | | | | Deploy key in multiple projects Add doc on adding a deploy key easily to multiple projects through the API.
| * | everything in headerJob van der Voort2014-05-191-3/+4
| | |
| * | add loop to deploy key to multiple projectsJob van der Voort2014-05-051-1/+3
| | |
| * | start writing deploy key to multiple projectsJob van der Voort2014-04-181-0/+22
| | |
* | | Merge branch 'small-ui-improvements' into 'master'Dmitriy Zaporozhets2014-05-202-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Small ui improvements * fix ugly errors block when admin save invalid user * fix ugly errors when you tries to save invalid wiki page
| * | | Fix UI for wiki error messageDmitriy Zaporozhets2014-05-201-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix admin user errors uiDmitriy Zaporozhets2014-05-201-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'milestome-ui' into 'master'Dmitriy Zaporozhets2014-05-201-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 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
| * | | Small UI change to milestone page so it looks similar to issue/mrDmitriy Zaporozhets2014-05-191-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'fix-install-guide' into 'master'Dmitriy Zaporozhets2014-05-201-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix install guide Fix gitlab setup. DB setup must go after gitlab-shell setup. Because in seeds we need `/home/git/repositories` to exist
| * | | | Do gitlab:shell setup before seeds because we need /home/git/repositories existsDmitriy Zaporozhets2014-05-201-9/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'create_pg_indexes' into 'master'Dmitriy Zaporozhets2014-05-201-6/+34
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Rebuild Postgres indexes after a MySQL conversion
| * | | | Rebuild indexes after a MySQL conversionJacob Vosmaer2014-05-191-5/+33
| | | | |
| * | | | Use the gitlabhq fork of the MySQL converterJacob Vosmaer2014-05-191-1/+1
|/ / / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-05-191-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge pull request #6998 from pkallberg/masterSytse Sijbrandij2014-05-191-0/+2
| |\ \ \ | | |/ / | |/| | Added Cloud 66 to third party one-click installers
| | * | Removed exclamation mark for Cloud 66 installerPhilip Källberg2014-05-191-1/+1
| | | |
| | * | Added Cloud 66 to third party one-click installersPhilip Källberg2014-05-191-0/+2
| |/ /
* | | Merge branch 'ubuntu-14-needs-recent-ruby-patch' into 'master'Dmitriy Zaporozhets2014-05-191-2/+2
|\ \ \ | | | | | | | | | | | | Ubuntu 14 needs recent ruby patch
| * | | Ruby version updated so it doesn't have the readline bug ↵dosire2014-05-191-2/+2
|/ / / | | | | | | | | | https://www.ruby-lang.org/en/news/2014/05/09/ruby-2-0-0-p481-is-released/.
* | | Merge branch '6.9.0.rc1' into 'master'Dmitriy Zaporozhets2014-05-193-9/+105
|\ \ \ | |/ / |/| | | | | Version 6.9.0.rc1
| * | 6.9.0 RC1v6.9.0.rc1Marin Jankovski2014-05-191-1/+1
| | |
| * | Update installation guide, create update guide.Marin Jankovski2014-05-192-8/+104
|/ /
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-05-191-0/+1
|\ \
| * \ Merge pull request #6990 from Scooletz/masterDmitriy Zaporozhets2014-05-181-0/+1
| |\ \ | | | | | | | | .NET client introduced to docs
| | * | .NET client introduced to docsScooletz2014-05-171-0/+1
| |/ /
* | | Merge branch 'logrotate_update_fix' into 'master'Dmitriy Zaporozhets2014-05-192-3/+4
|\ \ \ | | | | | | | | | | | | Clean up *.log.1 files during 6.6-to-6.7 upgrade
| * | | Clean up *.log.1 files during 6.6-to-6.7 upgradeJacob Vosmaer2014-05-161-0/+4
| | | |
| * | | Remove logrotate step (no change in 6.8)Jacob Vosmaer2014-05-161-3/+0
| | | |
* | | | Merge branch 'use_example_email' into 'master'Dmitriy Zaporozhets2014-05-184-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use example email in documents and example files Fixes #1177
| * | | | Update the examples to example.comMarin Jankovski2014-05-164-11/+11
| |/ / /
* | | | Merge branch 'add-link-to-ee-jenkins' into 'master'Dmitriy Zaporozhets2014-05-182-0/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | Add link to ee jenkins /cc @marin
| * | | Inform about the EE features.dosire2014-05-172-0/+4
|/ / /
* | | Merge branch 'fix-group-members-search' into 'master'Dmitriy Zaporozhets2014-05-163-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix group members search Postgres only. 500 error when try to search group members on `/groups/:group_id/members` page
| * | | Fix 500 error on group members searchDmitriy Zaporozhets2014-05-163-1/+15
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status