home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,017 Commits 48 Branches 340 Tags
5e89354fe605f8b6ed5b2db47935be76876dfd3e
Commit Graph
506 Commits
Author SHA1 Message Date
Marin Jankovski e3f736d258 Add Jira service. 2014-05-13 12:12:16 +02: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
Marin Jankovski d9c0ecdca8 Add scope to dn filter. 2014-05-09 14:51:29 +02:00
Marin Jankovski 47c0b4b172 Add scoping to ldap lookup. 2014-05-08 15:30:16 +02:00
C. Morgan Hamill 0456101117 Clean up conditional statement in name method. 
Reverse the conditional order to avoid awkward `if !` construction.
 2014-05-08 09:23:17 -04:00
C. Morgan Hamill a45f7262f9 Clean up of name fallback code. 
Don't use `unless` for the conditional.
Avoid double-quotes where possible.
 2014-05-07 16:41:35 -04:00
C. Morgan Hamill 9e805b7754 Provide fallback for missing name value. 
If `auth.info.name` is `nil`, then use `auth.info.first_name + auth.info.last_name`
as the value of `name`.
 2014-05-07 16:33:54 -04:00
Dmitriy Zaporozhets 4fea8afc4b Add CompareAction class for collecting commits and diffs using satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 16:14:24 +03:00
Marin Jankovski 7bc054ec8a Add support for Jira ticket mentions in format JIRA-123. 2014-05-06 19:51:56 +02:00
Dmitriy Zaporozhets cac916d974 Clean working directory in satellite 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-05 14:21:00 +03:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Ben Bytheway de794b6a77 Add scoping to ldap lookup when only dn given 2014-04-23 21:00:56 -06:00
Dmitriy Zaporozhets c4e713a5b6 Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee 
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
 2014-04-22 11:58:11 +02:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Dmitriy Zaporozhets eff30fff08 Improve dn_matches_filter method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-15 17:27:59 +03:00
Dmitriy Zaporozhets 1fe677995c LDAP::Adapter#ldap_search method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-15 16:50:31 +03:00
Dmitriy Zaporozhets 448e5c133a Merge branch 'satellite_exists_in_automerge_check' into 'master' 
Satellite exists in automerge check
 2014-04-14 13:21:49 +00:00
Dmitriy Zaporozhets 5f9592e4b0 Merge pull request #6405 from awiddersheim/fix_space_in_commit_message 
Fix extra space added in beginning of commit message
 2014-04-13 20:04:25 +03:00
Marin Jankovski aa6426f46d Satellite will exist when doing automerge_check. 2014-04-11 10:22:32 +02:00
Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
 2014-04-10 13:34:56 +03:00
Marin Jankovski 63ba983511 Dont raise an error with satellites, make sure it exists. 2014-04-09 17:13:44 +02:00
Dmitriy Zaporozhets e6f58cb87d Avoid false validation when create user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:47:37 +03:00
Dmitriy Zaporozhets 5436d6afd6 Make oauth works for google oauth too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:36:33 +03:00
Dmitriy Zaporozhets a73df4f72d Allow oauth signup without email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:09:29 +03:00
Marin Jankovski 1187d3f28d Synchronize user email with ldap. 2014-04-04 13:08:28 +02:00
Dmitriy Zaporozhets 5350492842 Fix support for force_push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 15:03:45 +03:00
Dmitriy Zaporozhets 207f34b890 Merge pull request #6190 from Popl7/add-better-branch-protection-against-history-rewrite-and-deletion 
protect protected branched to force updates
 2014-04-03 14:33:34 +03:00
Dmitriy Zaporozhets fdeacf0ad1 Merge pull request #6317 from jirutka/fix-ldap-dn-case 
Fix searching by extern_uid for LDAP to be case-insensitive
 2014-03-29 14:08:31 +02:00
Jacob Vosmaer 2bfa02bb3c Check for errors in Adapter#dn_matches_filter? 2014-03-28 14:29:04 +01:00
Jacob Vosmaer 2e6b537018 Use omniauth nickname as the username for LDAP 
Before there was a bug in omniauth-ldap which prevented samaccountname
showing up as a possible username for new LDAP users. Thanks to upstream
fixes, we no longer need to work around this bug.
 2014-03-28 13:57:52 +01:00
Dmitriy Zaporozhets 713815df14 Skip git hooks if oldrev or newrev is nil 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 17:24:53 +02:00
Steven Thonus 8b35b20837 first setup to protect protected branched to force updates 2014-03-25 22:33:14 +01:00
Marin Jankovski 9dd58c320a Add to changelog. 2014-03-25 18:53:09 +01:00
Marin Jankovski 02850210b6 Allow referencing an existing user. 2014-03-25 18:53:09 +01:00
Dmitriy Zaporozhets 3a293fa966 Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
	lib/gitlab/backend/grack_auth.rb
 2014-03-25 10:12:59 +02:00
Robert Speicher 760f827ba0 Remove code that does nothing 
ping @karlhungus
 2014-03-22 15:40:42 -04:00
Robert Speicher fa34059574 Default message for SatelliteNotExistError 2014-03-22 15:36:54 -04:00
Dmitriy Zaporozhets a261c5fc94 Fix upgrader 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:09:33 +02:00
Dmitriy Zaporozhets ae1a314824 Fix upgrader 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:08:36 +02:00
Dmitriy Zaporozhets b8d83d2538 Fix gitlab-ci integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:05:28 +02:00
Dmitriy Zaporozhets 5c038d949f Fix gitlab-ci integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:04:57 +02:00
Dmitriy Zaporozhets c55d2345ee Fix http clone for public project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 15:04:21 +02:00
Dmitriy Zaporozhets 7dd18a3ec8 Fix http clone for public project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 14:52:30 +02:00
Dmitriy Zaporozhets 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb
 2014-03-21 12:22:43 +02:00
Dmitriy Zaporozhets d4957ee78e Merge branch 'git-hooks' into 'master' 
Git Hooks
 2014-03-21 07:52:25 +00:00
Dmitriy Zaporozhets abd6d821fc Merge branch 'recursive_ldap_groups' into 'master' 
Recursive LDAP groups (ActiveDirectory only)
 2014-03-21 07:15:54 +00:00
Dmitriy Zaporozhets b8dc5d2c5f Implement 2 git hooks: tagf removal and commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:59:01 +02:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Jacob Vosmaer 8722d6bdc4 Add an API reference for AD recursive LDAP lookup 2014-03-20 13:28:10 +01:00
Dmitriy Zaporozhets 450188501d Improve grack auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:55:42 +02:00