Commits · 25da1415d385bc5d662998688c0b166b39392f29 · iv / gitlab-ce

19 Jan, 2014 2 commits

Merge branch 'jeromedalbert-add_website_url_to_user' · 25da1415
Dmitriy Zaporozhets authored Jan 19, 2014

25da1415

Merge branch 'add_website_url_to_user' of... · f8aae4b7

Dmitriy Zaporozhets authored Jan 19, 2014

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

f8aae4b7

18 Jan, 2014 9 commits
- Merge branch 'improve/search_autocomplete' into 'master' · d95e56f0
  Dmitriy Zaporozhets authored Jan 18, 2014
```
Improve: Search autocomplete

* fetch options via ajax
* only show options related to user input
* add limit to amount of options
```
  d95e56f0
- Add website url to user · 2e3f250d
  Jerome Dalbert authored Jan 18, 2014
  
  2e3f250d
- Mention change of search autocomplete in CHANGELOG · 1016b547
  Dmitriy Zaporozhets authored Jan 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1016b547
- Case-insensetive search autocomplete for projets · 712a2ec4
  Dmitriy Zaporozhets authored Jan 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  712a2ec4
- Prevent duplicate method names in helpers · 757e92d5
  Dmitriy Zaporozhets authored Jan 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  757e92d5
- Fix search autocomplete · ffbbccb7
  Dmitriy Zaporozhets authored Jan 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ffbbccb7
- Merge branch 'efficient-clone' into 'master' · 96808199
  Dmitriy Zaporozhets authored Jan 18, 2014
```
Efficient Clone

Since https://github.com/gitlabhq/grack/pull/1 this warning is no longer needed I think.
```
  96808199
- Refactor search autocomplete. Use ajax for source · 073a2698
  Dmitriy Zaporozhets authored Jan 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  073a2698
- Since the git clone code is more efficient now we do not need this warning anymore. · a757c4a2
  dosire authored Jan 18, 2014
  
  a757c4a2
17 Jan, 2014 6 commits
- Merge branch 'explain_ldap_check' into 'master' · 4d7792bc
  Dmitriy Zaporozhets authored Jan 17, 2014
```
Improve the explanation of the LDAP check script
```
  4d7792bc
- Fix typo in LDAP explanation comment · d435fbb9
  Jacob Vosmaer authored Jan 17, 2014
  
  d435fbb9
- Merge branch 'explain_allow_username_or_email_login' into 'master' · 3fe578a7
  Dmitriy Zaporozhets authored Jan 17, 2014
```
Explain allow_username_or_email_login LDAP setting
```
  3fe578a7
- Explain allow_username_or_email_login LDAP setting · 390f0b76
  Jacob Vosmaer authored Jan 17, 2014
  
  390f0b76
- Merge branch 'refactoring/context_into_services' into 'master' · f0d2d281
  Dmitriy Zaporozhets authored Jan 17, 2014
```
Refactoring context Into services

To prevent confusion where to write logic. Context or Service?
```
  f0d2d281
- Merge branch 'feature/base64_content' into 'master' · 7527408a
  Dmitriy Zaporozhets authored Jan 17, 2014
```
Feature: base64 encoding for blob content
```
  7527408a
16 Jan, 2014 23 commits
- Fix require for file services · 4d82e9ed
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4d82e9ed
- Replace context with service in lib · efa10c81
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  efa10c81
- Replace context with service in specs · 4a1654ed
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4a1654ed
- Explain that `limit` only applies to the check · af9a14c4
  Jacob Vosmaer authored Jan 16, 2014
  
  af9a14c4
- Fix encoding pass to edit file satellite · 1c4870c5
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1c4870c5
- Move all Context classes into Services · 1d2bdb4d
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1d2bdb4d
- Add base64 encoding selector to new file UI so you can add image to repo · 8f0a97da
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8f0a97da
- Accept encoding attribute in files API · 4f2e9fb8
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4f2e9fb8
- Add files encoding support on context level · 7001ad2d
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7001ad2d
- Mention base64 encoding for files API · 1d497a12
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1d497a12
- Add support of base64 encoded content · 21bc41c6
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  21bc41c6
- Merge pull request #6061 from zzet/patch-8 · dba98240
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Fix deprecation in specs
```
  dba98240
- Merge pull request #6062 from skv-headless/fix_n+1_user_page · de68dd26
  Dmitriy Zaporozhets authored Jan 16, 2014
```
fix n+1 problem for namespaces
```
  de68dd26
- Merge branch 'custom_password_length' into 'master' · 3d743d45
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Document how to customize password length limits
```
  3d743d45
- Merge branch 'new-branch-usability' into 'master' · 5437c3ea
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Improve usability of new branch form
```
  5437c3ea
- Merge branch 'refactoring/issues_filter' into 'master' · e3f436dc
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Refactoring: Issues/MR filtering logic

Move all issues, mr filtering logic into FilteringService
```
  e3f436dc
- Merge branch '6-4-update-guide' into 'master' · 70f17624
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Improve 6-4 update guide
```
  70f17624
- Merge branch 'webhook_verify_none' into 'master' · 206741f0
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Disable SSL peer verification for all webhooks

SSL peer verification was silently enabled by the HTTParty upgrade in 8a54fda4.
This patch restores the previous behaviour of GitLab 6.3 and earlier.
```
  206741f0
- New branch doesn't exist yet. · d015bb32
  dosire authored Jan 16, 2014
  
  d015bb32
- Merge branch 'say-media-mention' into 'master' · 4416b57f
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Say Media Mention

Sponsorship message for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/388/diffs
```
  4416b57f
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · fd688f89
  Dmitriy Zaporozhets authored Jan 16, 2014
  
  fd688f89
- FilteringService works with scope :all event if current user is not defined · 974281d1
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  974281d1
- Merge pull request #6065 from jvanbaarsen/github-email-fix · 50b6a6d1
  Dmitriy Zaporozhets authored Jan 16, 2014
```
Always ask for email with github omniauth
```
  50b6a6d1