Commits · 4b9c28bccded2064fc95cf891b87a375d5bcdcf7 · nexedi / gitlab-ce

11 Feb, 2014 3 commits
- remove unwanted spaces, reduce diff, clean before merge · 4b9c28bc
  GitLab authored Feb 11, 2014
  
  4b9c28bc
- Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into... · 1739b7fc
  GitLab authored Feb 11, 2014
```
Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into retrieve_ssh_keys_by_ssh
```
  1739b7fc
- code refactor as per standards · 46ad09bf
  GitLab authored Feb 11, 2014
  
  46ad09bf
06 Feb, 2014 10 commits
- update manual error in changelog while merging · 42083b19
  Devaroop Bhattacharya authored Feb 06, 2014
  
  42083b19
- Update Gemfile.lock · 5101ff7b
  Devaroop Bhattacharya authored Feb 06, 2014
  
  5101ff7b
- Update Gemfile · 16d6eb3f
  Devaroop Bhattacharya authored Feb 06, 2014
  
  16d6eb3f
- sync with upstream for ease to merge · b1492a2a
  GitLab authored Feb 06, 2014
  
  b1492a2a
- merge with upstream master · 319f355a
  GitLab authored Feb 06, 2014
  
  319f355a
- adding tests for the ssh keys feature · 1c9a41e0
  GitLab authored Feb 06, 2014
  
  1c9a41e0
- Better color for nav links · f99ee99f
  Dmitriy Zaporozhets authored Feb 06, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f99ee99f
- Merge branch 'link-to-recipies' into 'master' · c0ec30ae
  Dmitriy Zaporozhets authored Feb 06, 2014
```
Link To Recipies

People can't find the CentOS / RHEL guide. Now that it follows the official guide I think we can link to it.
```
  c0ec30ae
- Merge branch 'update_gitlab_grit' into 'master' · db5f0e7e
  Dmitriy Zaporozhets authored Feb 06, 2014
```
Update gitlab-grit
```
  db5f0e7e
- Merge branch 'remove_ajax_gif' into 'master' · 4f1c2386
  Dmitriy Zaporozhets authored Feb 06, 2014
```
Remove Ajax Gif
```
  4f1c2386
05 Feb, 2014 19 commits
- Improve turbolink spinner · fc953eb1
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fc953eb1
- Replace gif animation with font icon spinner · 268c183b
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  268c183b
- Update gitlab-grit · 01a097d7
  Jacob Vosmaer authored Feb 05, 2014
  
  01a097d7
- Fixed commit align on dashboard feed · 883409b9
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  883409b9
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · f1402213
  Dmitriy Zaporozhets authored Feb 05, 2014
  
  f1402213
- Merge branch 'gitlab_git_gem' into 'master' · 036cf6fc
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Use gitlab_git from rubygems
```
  036cf6fc
- Merge branch 'improve/compare_page' into 'master' · ea2a57cd
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Improve Compare page

Prevent Compare page timout for large amount of commits.
Fixes #989
```
  ea2a57cd
- Merge pull request #6252 from arruda/doc_fix · 475864d5
  Sytse Sijbrandij authored Feb 05, 2014
```
Fixing comment about password in database docs
```
  475864d5
- removing comment about changing the git user password for postgres, · 1d11a7fd
  Felipe Arruda Pontes authored Feb 05, 2014
```
as discussed in #6248
```
  1d11a7fd
- Use gitlab_git from rubygems · 41b55d75
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  41b55d75
- Merge branch 'minor_refactoring' into 'master' · 2b592f29
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Minor refactoring

Add Repository#blob_at_branch method
```
  2b592f29
- Prevent 500 error on Compare page if diff read timout happens · a1a01254
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a1a01254
- Use MergeRequestDiff::COMMITS_SAFE_SIZE for Compare diff limit. · 8f88cbf0
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8f88cbf0
- Prevent Compare page timout for large amount of commits · 68249f23
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  68249f23
- Repository#blob_at_branch · 55572c4e
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  55572c4e
- Merge branch 'gitlab_git_rugged' into 'master' · d701d586
  Dmitriy Zaporozhets authored Feb 05, 2014
```
gitlab_git with rugged

Updated gitlab_git version with Blob via rugged
```
  d701d586
- Remove duplication and link to CentOS guide. · 665a2f60
  dosire authored Feb 05, 2014
  
  665a2f60
- Merge branch 'squashed-migrations' into 'master' · 10aa84bd
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Squashed migrations for 2011 and 2012
```
  10aa84bd
- Fix blobs for file services · fc16a228
  Dmitriy Zaporozhets authored Feb 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fc16a228
04 Feb, 2014 8 commits
- Fix markdown renderer · 31987259
  Dmitriy Zaporozhets authored Feb 04, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  31987259
- Merge pull request #5294 from dalehamel/master · da34e008
  Dmitriy Zaporozhets authored Feb 04, 2014
```
Ensure directory exists before changing in popen
```
  da34e008
- Merge pull request #6238 from athos-ribeiro/devise_unconfirmed_access · 1080a9ba
  Dmitriy Zaporozhets authored Feb 04, 2014
```
Change Devise.confirm_within to Devise.allow_unconfirmed_access_for
```
  1080a9ba
- Squash migrations for years 2011 and 2012 · e8f8abdd
  Dmitriy Zaporozhets authored Feb 04, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e8f8abdd
- Merge branch 'architecture' into 'master' · 32b9ec50
  Dmitriy Zaporozhets authored Feb 04, 2014
```
Architecture

Cleanup of architecture doc.
```
  32b9ec50
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 98fe8fb9
  Dmitriy Zaporozhets authored Feb 04, 2014
  
  98fe8fb9
- BUmp gitlab-git version (Blobs via rugged) · f297c6b3
  Dmitriy Zaporozhets authored Feb 04, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f297c6b3
- Merge branch 'bug/500_tag_name' into 'master' · 3a1c6ccc
  Dmitriy Zaporozhets authored Feb 04, 2014
```
Fix 500 on tags page

Fix bug when grit parse tags wrong and raise exception on tags page.
Fixes #993
```
  3a1c6ccc