OSDN Git Service
Sytse Sijbrandij [Mon, 20 Jan 2014 12:14:22 +0000 (12:14 +0000)]
Merge branch 'cloning_is_still_the_same' into 'master'
Git clone performance is still the same
Jacob Vosmaer [Mon, 20 Jan 2014 12:06:32 +0000 (13:06 +0100)]
Revert "Since the git clone code is more efficient now we do not need this warning anymore."
This reverts commit
a757c4a24f110aa25ad36dd347d499cf859e4d0d.
While it is true that Grack memory use while sending data to a client
was improved, this does not change the fact that the Git processes
running on a GitLab server will use more memory for large repositories.
Dmitriy Zaporozhets [Mon, 20 Jan 2014 10:56:36 +0000 (12:56 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Sytse Sijbrandij [Mon, 20 Jan 2014 10:37:15 +0000 (02:37 -0800)]
Merge pull request #6078 from sag47/irc_nicknames
Add IRC nicknames to channel admins
Sytse Sijbrandij [Mon, 20 Jan 2014 10:01:18 +0000 (10:01 +0000)]
Merge branch 'ee_update_instructions' into 'master'
Add EE checkout instructions to update docs
Jacob Vosmaer [Mon, 20 Jan 2014 09:38:16 +0000 (10:38 +0100)]
Add EE checkout instructions to update docs
Dmitriy Zaporozhets [Mon, 20 Jan 2014 07:20:07 +0000 (07:20 +0000)]
Merge branch 'init.d' of /mnt/ebs/repositories/arifali1/gitlab-ce
Dmitriy Zaporozhets [Sun, 19 Jan 2014 18:29:06 +0000 (10:29 -0800)]
Merge pull request #6072 from jvanbaarsen/fix-3516
Better check on the validity of emails
Dmitriy Zaporozhets [Sun, 19 Jan 2014 18:24:02 +0000 (20:24 +0200)]
Merge branch 'jeromedalbert-add_website_url_to_user'
Dmitriy Zaporozhets [Sun, 19 Jan 2014 18:23:29 +0000 (20:23 +0200)]
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
Dmitriy Zaporozhets [Sat, 18 Jan 2014 22:12:55 +0000 (22:12 +0000)]
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
Jerome Dalbert [Sat, 18 Jan 2014 19:07:00 +0000 (19:07 +0000)]
Add website url to user
Dmitriy Zaporozhets [Sat, 18 Jan 2014 14:26:39 +0000 (16:26 +0200)]
Mention change of search autocomplete in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 18 Jan 2014 14:22:57 +0000 (16:22 +0200)]
Case-insensetive search autocomplete for projets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 18 Jan 2014 14:06:20 +0000 (16:06 +0200)]
Prevent duplicate method names in helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 18 Jan 2014 13:02:53 +0000 (15:02 +0200)]
Fix search autocomplete
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 18 Jan 2014 12:24:26 +0000 (12:24 +0000)]
Merge branch 'efficient-clone' into 'master'
Efficient Clone
Since https://github.com/gitlabhq/grack/pull/1 this warning is no longer needed I think.
Dmitriy Zaporozhets [Sat, 18 Jan 2014 12:16:46 +0000 (14:16 +0200)]
Refactor search autocomplete. Use ajax for source
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
dosire [Sat, 18 Jan 2014 10:35:03 +0000 (11:35 +0100)]
Since the git clone code is more efficient now we do not need this warning anymore.
Dmitriy Zaporozhets [Fri, 17 Jan 2014 14:14:05 +0000 (14:14 +0000)]
Merge branch 'explain_ldap_check' into 'master'
Improve the explanation of the LDAP check script
Jacob Vosmaer [Fri, 17 Jan 2014 10:39:33 +0000 (11:39 +0100)]
Fix typo in LDAP explanation comment
Dmitriy Zaporozhets [Fri, 17 Jan 2014 10:37:22 +0000 (10:37 +0000)]
Merge branch 'explain_allow_username_or_email_login' into 'master'
Explain allow_username_or_email_login LDAP setting
Jacob Vosmaer [Fri, 17 Jan 2014 10:34:06 +0000 (11:34 +0100)]
Explain allow_username_or_email_login LDAP setting
Dmitriy Zaporozhets [Fri, 17 Jan 2014 09:47:47 +0000 (09:47 +0000)]
Merge branch 'refactoring/context_into_services' into 'master'
Refactoring context Into services
To prevent confusion where to write logic. Context or Service?
Dmitriy Zaporozhets [Fri, 17 Jan 2014 09:46:51 +0000 (09:46 +0000)]
Merge branch 'feature/base64_content' into 'master'
Feature: base64 encoding for blob content
Sam Gleske [Fri, 17 Jan 2014 01:43:50 +0000 (20:43 -0500)]
Add IRC nicknames to channel admins
Dmitriy Zaporozhets [Thu, 16 Jan 2014 18:36:51 +0000 (20:36 +0200)]
Fix require for file services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 18:35:21 +0000 (20:35 +0200)]
Replace context with service in lib
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 18:29:18 +0000 (20:29 +0200)]
Replace context with service in specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Thu, 16 Jan 2014 17:40:45 +0000 (18:40 +0100)]
Explain that `limit` only applies to the check
Dmitriy Zaporozhets [Thu, 16 Jan 2014 17:31:12 +0000 (19:31 +0200)]
Fix encoding pass to edit file satellite
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 17:03:42 +0000 (19:03 +0200)]
Move all Context classes into Services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 16:25:32 +0000 (18:25 +0200)]
Add base64 encoding selector to new file UI so you can add image to repo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 16:11:00 +0000 (18:11 +0200)]
Accept encoding attribute in files API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 16:10:35 +0000 (18:10 +0200)]
Add files encoding support on context level
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 16:09:58 +0000 (18:09 +0200)]
Mention base64 encoding for files API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 16:02:09 +0000 (18:02 +0200)]
Add support of base64 encoded content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Thu, 16 Jan 2014 11:14:47 +0000 (12:14 +0100)]
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
Dmitriy Zaporozhets [Thu, 16 Jan 2014 10:28:31 +0000 (02:28 -0800)]
Merge pull request #6061 from zzet/patch-8
Fix deprecation in specs
Dmitriy Zaporozhets [Thu, 16 Jan 2014 10:28:01 +0000 (02:28 -0800)]
Merge pull request #6062 from skv-headless/fix_n+1_user_page
fix n+1 problem for namespaces
Dmitriy Zaporozhets [Thu, 16 Jan 2014 10:25:47 +0000 (10:25 +0000)]
Merge branch 'custom_password_length' into 'master'
Document how to customize password length limits
Dmitriy Zaporozhets [Thu, 16 Jan 2014 10:22:00 +0000 (10:22 +0000)]
Merge branch 'new-branch-usability' into 'master'
Improve usability of new branch form
Dmitriy Zaporozhets [Thu, 16 Jan 2014 10:21:21 +0000 (10:21 +0000)]
Merge branch 'refactoring/issues_filter' into 'master'
Refactoring: Issues/MR filtering logic
Move all issues, mr filtering logic into FilteringService
Dmitriy Zaporozhets [Thu, 16 Jan 2014 10:14:48 +0000 (10:14 +0000)]
Merge branch '6-4-update-guide' into 'master'
Improve 6-4 update guide
Dmitriy Zaporozhets [Thu, 16 Jan 2014 10:13:00 +0000 (10:13 +0000)]
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
8a54fda45957b3755f7c06e5c9b955c794488ff1.
This patch restores the previous behaviour of GitLab 6.3 and earlier.
dosire [Thu, 16 Jan 2014 10:05:55 +0000 (11:05 +0100)]
New branch doesn't exist yet.
Dmitriy Zaporozhets [Thu, 16 Jan 2014 09:43:38 +0000 (09:43 +0000)]
Merge branch 'say-media-mention' into 'master'
Say Media Mention
Sponsorship message for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/388/diffs
Dmitriy Zaporozhets [Thu, 16 Jan 2014 09:42:10 +0000 (11:42 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 16 Jan 2014 09:40:33 +0000 (11:40 +0200)]
FilteringService works with scope :all event if current user is not defined
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 16 Jan 2014 09:24:18 +0000 (01:24 -0800)]
Merge pull request #6065 from jvanbaarsen/github-email-fix
Always ask for email with github omniauth
Sytse Sijbrandij [Thu, 16 Jan 2014 08:14:42 +0000 (00:14 -0800)]
Merge pull request #6048 from jvanbaarsen/patch-2
Added webbrowser requirements
dosire [Thu, 16 Jan 2014 07:39:49 +0000 (08:39 +0100)]
Add second sponsorship message, perfect world.
Dmitriy Zaporozhets [Wed, 15 Jan 2014 18:55:23 +0000 (20:55 +0200)]
Remove unnecessary spec
Dmitriy Zaporozhets [Wed, 15 Jan 2014 18:43:30 +0000 (18:43 +0000)]
Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhq
Jeroen van Baarsen [Tue, 14 Jan 2014 16:47:12 +0000 (17:47 +0100)]
Added webbrowser requirements
Fixes https://github.com/gitlabhq/gitlabhq/issues/4319
Jeroen van Baarsen [Wed, 15 Jan 2014 17:49:39 +0000 (18:49 +0100)]
Always ask for email with github omniauth
Fixes: #2061
Fix was proposed on twitter by: neic0, in the following tweet:
https://twitter.com/neic0/status/
423138339806392320
dosire [Wed, 15 Jan 2014 15:16:07 +0000 (16:16 +0100)]
Replace hints with text that is obviously not valid.
Dmitriy Zaporozhets [Wed, 15 Jan 2014 14:38:48 +0000 (16:38 +0200)]
Test hook properly
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 14:32:56 +0000 (16:32 +0200)]
Remove unnecessary contexts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 14:32:44 +0000 (16:32 +0200)]
Use FilteringService for project issuus, mrs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 14:32:07 +0000 (16:32 +0200)]
Specs for FilteringService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Wed, 15 Jan 2014 14:16:19 +0000 (15:16 +0100)]
Disable SSL peer verification for all webhooks
SSL peer verification was silently enabled by the HTTParty upgrade in
8a54fda45957b3755f7c06e5c9b955c794488ff1. This patch restores the
previous behaviour of GitLab 6.3 and earlier.
Dmitriy Zaporozhets [Wed, 15 Jan 2014 14:16:45 +0000 (16:16 +0200)]
Use FilteringService for Dashboard, Group pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 14:16:23 +0000 (16:16 +0200)]
Implement FilteringService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 13:31:49 +0000 (15:31 +0200)]
Fix commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 13:07:19 +0000 (13:07 +0000)]
Merge branch 'improve/notification' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 15 Jan 2014 13:06:12 +0000 (15:06 +0200)]
Remove commit_load_context.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 12:38:50 +0000 (14:38 +0200)]
Convert TestHookContext into TestHookService. Added tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 12:26:05 +0000 (14:26 +0200)]
Use instance methods for system_hooks_service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 12:03:52 +0000 (14:03 +0200)]
Move repo rename email to notification service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 11:36:53 +0000 (13:36 +0200)]
Customize merge commit message in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
skv [Wed, 15 Jan 2014 11:23:47 +0000 (15:23 +0400)]
fix n+1 problem for namespaces
Andrew Kumanyaev [Wed, 15 Jan 2014 11:00:11 +0000 (14:00 +0300)]
Fix deprecation in specs
From https://github.com/gitlabhq/gitlabhq/pull/6053
Dmitriy Zaporozhets [Wed, 15 Jan 2014 10:36:12 +0000 (10:36 +0000)]
Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 14 Jan 2014 21:59:46 +0000 (13:59 -0800)]
Merge pull request #6050 from jvanbaarsen/regex-fix
Allow . files to be created
Dmitriy Zaporozhets [Tue, 14 Jan 2014 21:55:51 +0000 (23:55 +0200)]
Revert "Fix deprecation in specs"
This reverts commit
414ead57ee294618e73ef62f521b11d98fdce3a0.
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:52:39 +0000 (21:52 +0200)]
Increase max height of select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:45:51 +0000 (21:45 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:45:20 +0000 (21:45 +0200)]
More styling to select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Tue, 14 Jan 2014 19:24:42 +0000 (11:24 -0800)]
Merge pull request #6056 from nburkley/patch-2
Fixing Link to Contributing guide
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:15:17 +0000 (21:15 +0200)]
Move sort dropdown to the right
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:07:59 +0000 (21:07 +0200)]
Fix issues selects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
nburkley [Tue, 14 Jan 2014 18:58:47 +0000 (19:58 +0100)]
Fixing Link to Contributing guide
Link was a 404, added missing '/' in url
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:55:59 +0000 (20:55 +0200)]
Add sort dropdown to merge requests list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:55:42 +0000 (20:55 +0200)]
Move issues sort dropdown to shared partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:49:32 +0000 (20:49 +0200)]
Move issues sort logic to Issuable concern
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:31:12 +0000 (10:31 -0800)]
Merge pull request #6053 from zzet/patch-6
Fix deprecation in specs
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:30:59 +0000 (10:30 -0800)]
Merge pull request #6054 from zzet/patch-7
Remove Debug from tests
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:28:41 +0000 (20:28 +0200)]
Add login and remember_me to devise permit list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:27:19 +0000 (20:27 +0200)]
Increase width of issue filter field
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:23:56 +0000 (20:23 +0200)]
Add hr below mr title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Andrew Kumanyaev [Tue, 14 Jan 2014 18:05:12 +0000 (21:05 +0300)]
Remove Debug from tests
Andrew Kumanyaev [Tue, 14 Jan 2014 17:57:29 +0000 (20:57 +0300)]
Fix deprecation in specs
DEPRECATION: `expect { }.not_to raise_error(SpecificErrorClass)` is deprecated. Use `expect { }.not_to raise_error` (with no args) instead. Called from /home/travis/build/gitlabhq/gitlabhq/spec/tasks/gitlab/backup_rake_spec.rb:42:in `block (4 levels) in <top (required)>'.
Dmitriy Zaporozhets [Tue, 14 Jan 2014 17:56:52 +0000 (19:56 +0200)]
Dont allow merge without commit message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Tue, 14 Jan 2014 17:26:01 +0000 (18:26 +0100)]
Allow . files to be created
Fixes: https://github.com/gitlabhq/gitlabhq/issues/5770
Dmitriy Zaporozhets [Tue, 14 Jan 2014 13:56:42 +0000 (13:56 +0000)]
Merge branch 'no-options' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 14 Jan 2014 13:47:15 +0000 (13:47 +0000)]
Merge branch 'improve/side_filters' of /home/git/repositories/gitlab/gitlabhq
dosire [Tue, 14 Jan 2014 13:24:00 +0000 (14:24 +0100)]
Add note about not wanting unneeded options.
Dmitriy Zaporozhets [Tue, 14 Jan 2014 11:51:59 +0000 (13:51 +0200)]
Improve side filters and make them look similar
Dmitriy Zaporozhets [Tue, 14 Jan 2014 10:55:54 +0000 (02:55 -0800)]
Merge pull request #6038 from jvanbaarsen/fix-5767
Fix for #5767
OSDN Git Service
