Commits · ede272406a36d8263ababd7aab86ece5d9a9b9b5 · nexedi / gitlab-ce · GitLab

10 Dec, 2013 10 commits
- Update config/* to rails4 · ede27240
  Dmitriy Zaporozhets authored Dec 06, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ede27240
- Use real gems · f38435b9
  Dmitriy Zaporozhets authored Dec 06, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f38435b9
- Migrate application to rails 4 step 1 · ac5842d9
  Dmitriy Zaporozhets authored Dec 05, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ac5842d9
- Rails 4 and other gems update · 8a54fda4
  Dmitriy Zaporozhets authored Dec 05, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8a54fda4
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 16697f6e
  Dmitriy Zaporozhets authored Dec 10, 2013
  
  16697f6e
- Merge branch 'key-generation' of /home/git/repositories/gitlab/gitlabhq · 6a90378d
  Dmitriy Zaporozhets authored Dec 10, 2013
  
  6a90378d
- Merge pull request #5779 from jvanbaarsen/patch-1 · 27900efb
  Dmitriy Zaporozhets authored Dec 10, 2013
```
Better warning when deleting a user
```
  27900efb
- Merge pull request #5781 from Rovanion/patch-5 · 2f148190
  Dmitriy Zaporozhets authored Dec 10, 2013
```
Git clone now gets the right branch from the getgo
```
  2f148190
- Merge pull request #5794 from maltefiala/master · e7960180
  Dmitriy Zaporozhets authored Dec 10, 2013
```
Added Rake:Attack cp information to Upgrade Guide 6.3.0
```
  e7960180
- Merge pull request #5798 from criteo/skip_confirmation · e4465376
  Dmitriy Zaporozhets authored Dec 10, 2013
```
Skip email confirmation with LDAP
```
  e4465376
09 Dec, 2013 20 commits
- Merge branch 'installation-link' of /home/git/repositories/gitlab/gitlabhq · 1ab91d88
  Dmitriy Zaporozhets authored Dec 09, 2013
  
  1ab91d88
- Merge branch 'feature/gitlab_shell_path' of /home/git/repositories/gitlab/gitlabhq · a7e2c492
  Dmitriy Zaporozhets authored Dec 09, 2013
  
  a7e2c492
- Use antialiased font-smoothing for webkit · a215dbe4
  Dmitriy Zaporozhets authored Dec 09, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a215dbe4
- Merge branch 'feature/api_version_admin' of /home/git/repositories/gitlab/gitlabhq · bc82b2f8
  Dmitriy Zaporozhets authored Dec 09, 2013
  
  bc82b2f8
- Merge branch 'bug/duplicates_in_search' of /home/git/repositories/gitlab/gitlabhq · a7e1290a
  Dmitriy Zaporozhets authored Dec 09, 2013
  
  a7e1290a
- Merge branch 'feature/no_reply' of /home/git/repositories/gitlab/gitlabhq · 8700e91d
  Dmitriy Zaporozhets authored Dec 09, 2013
  
  8700e91d
- Add gitlab-shell#path option in config · f1c82bc5
  Dmitriy Zaporozhets authored Dec 09, 2013
```
Before this commit gitlab-shell but me placed directly in home dir.
Ex:
  /home/git/gitlab-shell

After this change you can place gitlab-shell in custom location.
Ex:
  /Users/developer/gitlab/gitlab-shell
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f1c82bc5
- Installation should be a paragraph since it is deep linked from everywhere. · ee4dd77d
  dosire authored Dec 09, 2013
  
  ee4dd77d
- Set noreply@HOSTNAME for reply_to field in all emails · ccf2e48a
  Dmitriy Zaporozhets authored Dec 09, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ccf2e48a
- Remove duplicate items from search autocomplete · 954dd398
  Dmitriy Zaporozhets authored Dec 09, 2013
```
Old behaviour gave you duplicate entries if your project is public
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  954dd398
- Show GitLab API version on Admin#dashboard · d0637d63
  Dmitriy Zaporozhets authored Dec 09, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d0637d63
- Merge pull request #5548 from CromFr/master · c0f6a932
  Sytse Sijbrandij authored Dec 09, 2013
```
Fixed comments for running gitlab in a non-root path
```
  c0f6a932
- Merge pull request #5483 from e1himself/patch-1 · 96e21134
  Sytse Sijbrandij authored Dec 09, 2013
```
Fix Markdown help page: escape file link syntax example to leave it unprocessed
```
  96e21134
- Merge branch 'master' of https://github.com/gitlabhq/gitlabhq · 906c65b6
  Crom (Thibaut CHARLES) authored Dec 09, 2013
```
Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example
```
  906c65b6
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · dbf8ae73
  Dmitriy Zaporozhets authored Dec 09, 2013
  
  dbf8ae73
- Merge branch 'users_group_observer' of /home/git/repositories/gitlab/gitlabhq · 74b72003
  Dmitriy Zaporozhets authored Dec 09, 2013
  
  74b72003
- Skip email confirmation with LDAP · 2c4e3e00
  Maxime Brugidou authored Dec 09, 2013
  
  2c4e3e00
- Merge pull request #5471 from dex4er/feature_etc_default_gitlab · 31cdb7a4
  Jacob Vosmaer authored Dec 09, 2013
```
Read configuration variable file (/etc/default/gitlab) if it is present
```
  31cdb7a4
- Avoid duplicate group membership emails · 1af65c96
  Jacob Vosmaer authored Dec 06, 2013
  
  1af65c96
- The comments make it hard to copy paste commands. If you paste the whole line it fails. · 16617775
  dosire authored Dec 09, 2013
  
  16617775
08 Dec, 2013 1 commit
- Added Rake:Attack cp information to Upgrade Guide 6.3.0 · d80fa802
  maltefiala authored Dec 08, 2013
  
  d80fa802
07 Dec, 2013 4 commits
- Merge pull request #5791 from mmoll/typo · abf11135
  Sytse Sijbrandij authored Dec 07, 2013
```
fix typo: enthousiast -> enthusiast
```
  abf11135
- fix typo: enthousiast -> enthusiast · 300ddbf4
  Michael Moll authored Dec 07, 2013
  
  300ddbf4
- Merge branch 'add-book' of /home/git/repositories/gitlab/gitlabhq · 845b98ec
  Dmitriy Zaporozhets authored Dec 07, 2013
  
  845b98ec
- Mention enterprise edition and the book, also some cleanup. · d514d7ab
  dosire authored Dec 07, 2013
  
  d514d7ab
06 Dec, 2013 5 commits
- Git clone now gets the right branch from the getgo · 8583d7d1
  Rovanion Luckey authored Dec 06, 2013
```
Simplified the instructions by two steps.
```
  8583d7d1
- Show rails version in admin area · 1dfd585f
  Dmitriy Zaporozhets authored Dec 06, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1dfd585f
- Remove colors from icon helpers · 97e05469
  Dmitriy Zaporozhets authored Dec 06, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  97e05469
- Merge branch 'update-patch-guide' of /home/git/repositories/gitlab/gitlabhq · a4a27a5a
  Dmitriy Zaporozhets authored Dec 06, 2013
  
  a4a27a5a
- Better warning when deleting a user · 00d72e73
  Jeroen van Baarsen authored Dec 06, 2013
```
Warn the administrator better when deleting a user.
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
```
  00d72e73