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
7,913 Commits 48 Branches 340 Tags
f59fe341dec81f3d90fd91ea19fb28318445f6fd
Commit Graph
7913 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Radulescu f59fe341de add O'Reilly sponsorship in CHANGELOG 2014-01-21 10:20:05 +01:00
Sytse Sijbrandij 2a748d9a01 Merge branch 'ee_update_instructions' into 'master' 
Add EE checkout instructions to update docs
 2014-01-20 10:01:18 +00:00
Jacob Vosmaer da817a1f56 Add EE checkout instructions to update docs 2014-01-20 10:38:16 +01:00
Dmitriy Zaporozhets bb9e01cba6 Merge branch 'init.d' of /mnt/ebs/repositories/arifali1/gitlab-ce 2014-01-20 07:20:07 +00:00
Dmitriy Zaporozhets 3628eb84c4 Merge pull request #6072 from jvanbaarsen/fix-3516 
Better check on the validity of emails
 2014-01-19 10:29:06 -08:00
Dmitriy Zaporozhets 25da1415d3 Merge branch 'jeromedalbert-add_website_url_to_user' 2014-01-19 20:24:02 +02:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-01-19 20:23:29 +02:00
Dmitriy Zaporozhets d95e56f05e Merge branch 'improve/search_autocomplete' into 'master' 
Improve: Search autocomplete

* fetch options via ajax
* only show options related to user input
* add limit to amount of options
 2014-01-18 22:12:55 +00:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets 1016b547f5 Mention change of search autocomplete in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:26:39 +02:00
Dmitriy Zaporozhets 712a2ec4fd Case-insensetive search autocomplete for projets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:22:57 +02:00
Dmitriy Zaporozhets 757e92d52e Prevent duplicate method names in helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:06:20 +02:00
Dmitriy Zaporozhets ffbbccb7ea Fix search autocomplete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 15:02:53 +02:00
Dmitriy Zaporozhets 96808199b2 Merge branch 'efficient-clone' into 'master' 
Efficient Clone

Since https://github.com/gitlabhq/grack/pull/1 this warning is no longer needed I think.
 2014-01-18 12:24:26 +00:00
Dmitriy Zaporozhets 073a269831 Refactor search autocomplete. Use ajax for source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 14:16:46 +02:00
dosire a757c4a24f Since the git clone code is more efficient now we do not need this warning anymore. 2014-01-18 11:35:03 +01:00
Dmitriy Zaporozhets 4d7792bc38 Merge branch 'explain_ldap_check' into 'master' 
Improve the explanation of the LDAP check script
 2014-01-17 14:14:05 +00:00
Jacob Vosmaer d435fbb9b2 Fix typo in LDAP explanation comment 2014-01-17 11:39:33 +01:00
Dmitriy Zaporozhets 3fe578a7fd Merge branch 'explain_allow_username_or_email_login' into 'master' 
Explain allow_username_or_email_login LDAP setting
 2014-01-17 10:37:22 +00:00
Jacob Vosmaer 390f0b76b5 Explain allow_username_or_email_login LDAP setting 2014-01-17 11:34:06 +01:00
Dmitriy Zaporozhets f0d2d28118 Merge branch 'refactoring/context_into_services' into 'master' 
Refactoring context Into services

To prevent confusion where to write logic. Context or Service?
 2014-01-17 09:47:47 +00:00
Dmitriy Zaporozhets 7527408ad0 Merge branch 'feature/base64_content' into 'master' 
Feature: base64 encoding for blob content
 2014-01-17 09:46:51 +00:00
Dmitriy Zaporozhets 4d82e9ed0b Fix require for file services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 20:36:51 +02:00
Dmitriy Zaporozhets efa10c819d Replace context with service in lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 20:35:21 +02:00
Dmitriy Zaporozhets 4a1654ed6a Replace context with service in specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 20:29:18 +02:00
Jacob Vosmaer af9a14c49c Explain that limit only applies to the check 2014-01-16 18:40:45 +01:00
Dmitriy Zaporozhets 1c4870c54a Fix encoding pass to edit file satellite 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 19:31:12 +02:00
Dmitriy Zaporozhets 1d2bdb4d58 Move all Context classes into Services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 19:03:42 +02:00
Dmitriy Zaporozhets 8f0a97da04 Add base64 encoding selector to new file UI so you can add image to repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:25:32 +02:00
Dmitriy Zaporozhets 4f2e9fb8e5 Accept encoding attribute in files API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:11:00 +02:00
Dmitriy Zaporozhets 7001ad2dda Add files encoding support on context level 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:10:35 +02:00
Dmitriy Zaporozhets 1d497a127b Mention base64 encoding for files API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:09:58 +02: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
Jeroen van Baarsen 05e4af5b4c Better check on the validity of emails 
At this moment it was possible to enter emails like:
mailto:info@example.com. This was causing some issue in the frontend,
since those links became html mailto: links.

Fixes: #3516
 2014-01-16 12:14:47 +01:00
Dmitriy Zaporozhets dba982403b Merge pull request #6061 from zzet/patch-8 
Fix deprecation in specs
 2014-01-16 02:28:31 -08:00
Dmitriy Zaporozhets de68dd2601 Merge pull request #6062 from skv-headless/fix_n+1_user_page 
fix n+1 problem for namespaces
 2014-01-16 02:28:01 -08:00
Dmitriy Zaporozhets 3d743d4567 Merge branch 'custom_password_length' into 'master' 
Document how to customize password length limits
 2014-01-16 10:25:47 +00:00
Dmitriy Zaporozhets 5437c3ea1e Merge branch 'new-branch-usability' into 'master' 
Improve usability of new branch form
 2014-01-16 10:22:00 +00:00
Dmitriy Zaporozhets e3f436dc43 Merge branch 'refactoring/issues_filter' into 'master' 
Refactoring: Issues/MR filtering logic

Move all issues, mr filtering logic into FilteringService
 2014-01-16 10:21:21 +00:00
Dmitriy Zaporozhets 70f17624dc Merge branch '6-4-update-guide' into 'master' 
Improve 6-4 update guide
 2014-01-16 10:14:48 +00:00
Dmitriy Zaporozhets 206741f0a3 Merge branch 'webhook_verify_none' into 'master' 
Disable SSL peer verification for all webhooks

SSL peer verification was silently enabled by the HTTParty upgrade in 8a54fda459.
This patch restores the previous behaviour of GitLab 6.3 and earlier.
 2014-01-16 10:13:00 +00:00
dosire d015bb322f New branch doesn't exist yet. 2014-01-16 11:05:55 +01:00
Dmitriy Zaporozhets 4416b57f90 Merge branch 'say-media-mention' into 'master' 
Say Media Mention

Sponsorship message for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/388/diffs
 2014-01-16 09:43:38 +00:00
Dmitriy Zaporozhets fd688f8916 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-16 11:42:10 +02:00
Dmitriy Zaporozhets 974281d140 FilteringService works with scope :all event if current user is not defined 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 11:40:33 +02:00
Dmitriy Zaporozhets 50b6a6d1c9 Merge pull request #6065 from jvanbaarsen/github-email-fix 
Always ask for email with github omniauth
 2014-01-16 01:24:18 -08:00
Sytse Sijbrandij 4a3bbc238c Merge pull request #6048 from jvanbaarsen/patch-2 
Added webbrowser requirements
 2014-01-16 00:14:42 -08:00
dosire 708ae96dd7 Add second sponsorship message, perfect world. 2014-01-16 08:39:49 +01:00
Dmitriy Zaporozhets a77dfc464b Remove unnecessary spec 2014-01-15 20:55:23 +02:00
Dmitriy Zaporozhets 4e96b1759c Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 18:43:30 +00:00