Commit Graph
426 Commits
Author SHA1 Message Date
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
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 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
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
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 ae1a314824 Fix upgrader
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-21 23:08:36 +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 7dd18a3ec8 Fix http clone for public project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-21 14:52:30 +02:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Dmitriy Zaporozhets 83e83b6617 Improve grack auth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-20 10:53:03 +02:00
Dmitriy Zaporozhets 729b358ff2 push via http now served via /allowed API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 19c28822ef Add Gitlab::GitAccess class to resolve auth issues during pull/push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets a7ac57a1a3 Merge pull request #6534 from dlorch/master
JIRA project identifiers may also contain dashes '-'
2014-03-17 13:28:39 +02:00
Dmitriy Zaporozhets 39f80884db Improve developer seeds
Return execution of observers in seeds.
Mute email sending to letter opening in you browser.
Added `rake dev` task to reset db and add seeds.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-15 11:39:35 +02:00
Daniel Lorch 686128cd68 JIRA project identifiers may also contain dashes '-' 2014-03-14 18:08:05 +01:00
Jacob Vosmaer 779fa4a7b7 Use batch_add_keys in rake gitlab:shell:setup 2014-03-14 15:49:11 +01:00
Jacob Vosmaer 56df3dbff2 Add Gitlab::LDAP::Access.open
This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
2014-03-14 08:55:50 +01:00
Jacob Vosmaer af53aa9072 Add Gitlab::LDAP::Adapter.open
This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
2014-03-14 08:53:46 +01:00
Jacob Vosmaer 5a616649b5 Allow passing an adapter to Gitlab::LDAP::Person 2014-03-14 08:52:57 +01:00
Dmitriy Zaporozhets f16de8ac8c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-11 11:29:18 +02:00
Dmitriy Zaporozhets 0fdab6a747 Remove copyright
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-10 17:09:45 +02:00
Dmitriy Zaporozhets daa7f077db Port LDAP code from EE
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-10 14:48:08 +02:00
mk 61a72bc2e2 Allow underscore as the first char for project names.
Not sure if the default_regex really has to be expanded for this special use case. We tried to extend only the project_name_regex first, but that didn't help.
2014-03-06 14:08:40 +01:00
Jacob Vosmaer d6b0ac96f7 Invoke Kernel#system with separate arguments 2014-03-03 08:40:30 +01:00
Jacob Vosmaer 2b816075dc Replace backticks with Gitlab::Popen 2014-03-03 08:40:29 +01:00
Jacob Vosmaer 36c2c354fc Adapt use of Gitlab::Popen to new style 2014-02-25 12:00:33 +01:00
Jacob Vosmaer 38f4b61a58 Make it possible to call Gitlab::Popen.popen 2014-02-25 11:58:58 +01:00
Jacob Vosmaer 8016cefafe Make the Gitlab::Popen path argument optional 2014-02-25 11:58:22 +01:00
Jacob Vosmaer 0432bdf19e Change Gitlab::Popen to use arrays for commands 2014-02-25 11:57:42 +01:00
Jakub Jirutka 91e7692b66 Fix searching by extern_uid for LDAP to be case-insensitive 2014-02-18 19:38:22 +01:00
Dmitriy Zaporozhets da34e008c3 Merge pull request #5294 from dalehamel/master
Ensure directory exists before changing in popen
2014-02-04 07:21:35 -08:00
Dmitriy Zaporozhets 5221dbfee7 Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce 2014-01-27 07:57:36 +00:00
Corobi 17f7da3d97 improve upgrader "latest version" message 2014-01-25 23:33:55 +00:00
Jason Hollingsworth 71c157e43b Add files to path blacklist.
Remove empty ErrorsController
2014-01-24 20:06:44 -06:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 21bc41c6ee Add support of base64 encoded content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 18:02:09 +02:00
Dmitriy Zaporozhets 38d8d749d7 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 10:36:12 +00:00
Jeroen van Baarsen cc1f7ea2de Allow . files to be created
Fixes: https://github.com/gitlabhq/gitlabhq/issues/5770
2014-01-14 18:26:01 +01:00
Dmitriy Zaporozhets d84b0fa6b5 Add merge_commit_message argument for Satellite::MergeAction#merge 2014-01-13 16:49:35 +02:00
Dmitriy Zaporozhets 6a80083294 Use same code for diff and patch inside MergeAction
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-13 16:16:45 +02:00
Dmitriy Zaporozhets 7c6287c878 Add support of custom message to merge action of satellite
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-13 13:17:38 +02:00
Dmitriy Zaporozhets 515ed7755e Respect default theme settings. Fixed sign-in button on publica page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-10 13:58:52 +02:00
Dmitriy Zaporozhets 1ad2a93678 Merge pull request #5760 from dermoth/master
Fix HTTP push to public repos
2014-01-07 02:47:56 -08:00