home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,298 Commits 48 Branches 340 Tags
7-4-stable
Commit Graph
1766 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandValery Sizov a2dfff418b Dont allow guests..developers to manage group members 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:00:55 +02:00
Dmitriy ZaporozhetsandValery Sizov 995d198419 Split group members api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:00:46 +02:00
Jacob VosmaerandValery Sizov 16a10eb1cd Fix LDAP config lookup for provider 'ldap' 2014-10-24 12:53:32 +03:00
Jacob VosmaerandValery Sizov e8da077d4f Fix LDAP authentication for Git HTTP access 
Conflicts:
	CHANGELOG
 2014-10-23 17:53:19 +03:00
Dmitriy Zaporozhets ba22e3ae58 Merge branch 'stable-fix-ldap-check' into '7-4-stable' 
Fix ldap check [stable]

Fix ldap check for stable branch

See merge request !1208
 2014-10-22 09:56:59 +00:00
Dmitriy Zaporozhets 4c034142a1 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:12:46 +03:00
Dmitriy Zaporozhets 37e09858e8 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:12:33 +03:00
Ciro SantilliandDmitriy Zaporozhets db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +03:00
Jacob VosmaerandDmitriy Zaporozhets 082d59d21f Ask the wiki repo, not Gollum, if it's empty 
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
 2014-10-20 16:37:20 +03:00
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Jan-Willem van der Meer 9bf7bfda20 Remove unused methods 2014-10-14 12:09:24 +02:00
Jan-Willem van der Meer ab04096c6c Add explaining note to authentication method [skip ci] 2014-10-14 11:16:47 +02:00
Jan-Willem van der Meer 18d2ee31e8 Use server specific uid 2014-10-14 10:54:43 +02:00
Jan-Willem van der Meer d3056feb11 Make sure the filters are applied 2014-10-14 10:08:47 +02:00
Jan-Willem van der Meer b229b0f003 Fix authorization for LDAP login 2014-10-14 09:40:35 +02:00
Jan-Willem van der Meer 93505f7d04 DRY find method to find Gitlab user 2014-10-14 09:05:29 +02:00
Jan-Willem van der Meer 410d6e306b Remove unused method 2014-10-14 08:54:15 +02:00
Jan-Willem van der Meer 01b791237c Refactor lib files for multiple LDAP groups 2014-10-13 17:24:05 +02:00
Dmitriy Zaporozhets 9229893c8a Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
 2014-10-13 11:46:45 +00:00
Dmitriy Zaporozhets 7a01d0cc74 Merge branch 'bug_with_apostrophe' into 'master' 
Bug with apostrophe when at mentioning users

This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin&#39;s`.

Fixes #1034

See merge request !1165
 2014-10-12 18:50:55 +00:00
Dmitriy Zaporozhets b09fd2337a Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' 
Enabling markdown pipelines from gitlab

Define which markdown pipelines are used in GitLab from application instead from gem.

See merge request !1164
 2014-10-12 18:33:27 +00:00
Marin Jankovski 2ea166fc33 Make sure relative url and asset_host are honored, specs. 2014-10-10 17:31:47 +02:00
Jan-Willem van der Meer d059f50d4c Refactor OAuth refactorings to CE 2014-10-10 12:03:32 +02:00
Marin Jankovski be14c7a83f Add a comment on why we are using backward compatible ciphers. 2014-10-10 09:44:08 +02:00
Marin Jankovski 8ddb2be69a Revert "update ssl_ciphers" 
This reverts commit c41e5f5018.
 2014-10-10 09:38:39 +02:00
Marin Jankovski fc2adfb6e4 Add a comment why this is done. 2014-10-10 08:32:05 +02:00
Marin Jankovski 1d14676e0c Substitute right single quote back with apostrophe. 2014-10-10 08:24:58 +02:00
Marin Jankovski 64e72af3cb Replace apostrophe with right single quote to avoid markdown interpretation as issue 39. 2014-10-09 14:20:49 +02:00
Marin Jankovski b4828f4cf6 Enable markdown pipeline filters from inside gitlab. 2014-10-09 13:33:38 +02:00
Robert Schilling e1123e08f4 Merge pull request #7988 from marcaube/patch-1 
Import - Display message when skipping repo
 2014-10-08 12:05:18 +02:00
Marc Aubé ae5381f2cc Update import.rake 
Output a message when a repo is skipped
 2014-10-07 14:13:50 -04:00
Dmitriy Zaporozhets 06c91aa20e Improve wiki path parsing in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 17:28:55 +03:00
Dmitriy Zaporozhets 0bf99f6557 Developers can push to wiki repo. Protected branches does not affect wiki repo any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 16:05:24 +03:00
Dmitriy Zaporozhets 7bcd6f79a4 Merge pull request #7963 from cirosantilli/factor-previewable 
Factor markup? || gitlab_markdown? into new method
 2014-10-07 12:19:28 +03:00
Vinnie Okada 9f0083a96c Add task lists to issues and merge requests 
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input.  Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks.  Task status is also displayed in the MR and issue
lists.
 2014-10-05 22:15:27 -05:00
Vinnie Okada a9cd3bfaee Fix external commit links 
Display the '@' character for links to commits in other projects.
 2014-10-05 10:16:12 -05:00
Vinnie Okada bcf88c8559 Fix external issue links 
Display the project path in links to issues in other projects that use
an external issue tracker.
 2014-10-05 10:12:53 -05:00
Ciro Santilli 07e9cb6b77 Factor markup? || gitlab_markdown? into new method 2014-10-04 17:56:12 +02:00
Vinnie Okada 2c46c4523f Track projects in ReferenceExtractor 
Store both the project and identifier of extracted references.  This
prevents `ReferenceExtractor` from returning objects in the wrong
project for cross-project references.
 2014-10-03 12:30:20 -05:00
Vinnie Okada 7edc1439fe Fix ReferenceExtractor 
The cross-project reference feature broke the ReferenceExtractor class;
this fixes it.
 2014-10-03 12:30:20 -05:00
Vinnie Okada 1b1ba6b0a5 Implement cross-project Markdown references 
Enable linking to commits, merge requests, and issues in other projects
by prepending a namespaced project path to the reference.
 2014-10-03 12:30:20 -05:00
Dmitriy Zaporozhets ac6f032122 Merge pull request #7779 from Bugagazavr/hook_tag_push_events 
Add tag push events to project hook api
 2014-10-03 13:38:56 +03:00
Sytse Sijbrandij 0cc30145f4 Merge pull request #7664 from bbodenmiller/patch-2 
add HSTS Policy warning
 2014-10-03 12:12:23 +02:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Kirill Zaitsev b4963e9dda Add tag_push_events to project hook api 2014-10-03 10:23:32 +04:00
Dmitriy Zaporozhets 2478fecae6 Merge branch 'backup_fail_hard' into 'master' 
Fail harder in the backup script

See merge request !1143
 2014-10-02 09:28:23 +00:00
Dmitriy Zaporozhets 6c3ad0dab6 Merge pull request #7853 from Razer6/feature/html_pipeline 
Factor out Emoji parsing using html-pipeline-gitlab
 2014-10-02 11:18:40 +03:00
Jacob Vosmaer 02bf992f37 Fail harder in the backup script 
This change also shows the output of failed Git commands during the
backup.
 2014-10-01 15:43:27 +02:00