Commits · 4ca1a29de823205b2f84bc5330b60440ea70dbc1 · nexedi / gitlab-ce · GitLab

08 May, 2014 27 commits
- Merge pull request #6934 from skv-headless/ctrl_enter_form_submit · 4ca1a29d
  Dmitriy Zaporozhets authored May 08, 2014
```
submit notes forms by pressing ctrl+enter
```
  4ca1a29d
- Merge pull request #6860 from hszcg/dev · aa5f306d
  Dmitriy Zaporozhets authored May 08, 2014
```
Add support for side-by-side inline comments
```
  aa5f306d
- Merge pull request #6929 from asedge/fix_api_branches_with_periods · cb20ab02
  Dmitriy Zaporozhets authored May 08, 2014
```
Add fix for API when branch names have periods in them.  Relates to issu...
```
  cb20ab02
- Merge pull request #6941 from jvanbaarsen/typo-fix · 4d11a3d8
  Dmitriy Zaporozhets authored May 08, 2014
```
Fix a minor typo in the README
```
  4d11a3d8
- Merge branch 'rails_4_0_5' into 'master' · 5218537c
  Dmitriy Zaporozhets authored May 08, 2014
```
Rails 4.0.5
```
  5218537c
- Merge branch 'tar_version_encoding' into 'master' · e5de0068
  Dmitriy Zaporozhets authored May 08, 2014
```
Fix tar version string encoding bug
```
  e5de0068
- Apply the locale encoding to `tar --version` · da347d1b
  Jacob Vosmaer authored May 08, 2014
```
Fixes a bug with non-UTF8 locales introduced by
2b816075.
```
  da347d1b
- Fix tests · 41231862
  Dmitriy Zaporozhets authored May 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  41231862
- Merge branch '2-step-mr' into 'master' · 4917dc64
  Dmitriy Zaporozhets authored May 08, 2014
```
2 step merge request process
```
  4917dc64
- Dont allow mr compare with empty branches · 536373ad
  Dmitriy Zaporozhets authored May 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  536373ad
- Merge branch 'convert_backup_to_postgres' into 'master' · 4673d980
  Dmitriy Zaporozhets authored May 08, 2014
```
Convert MySQL backup to Postgres
```
  4673d980
- Merge branch 'update_gitlab_grit' into 'master' · 6af6f4b4
  Dmitriy Zaporozhets authored May 08, 2014
```
Update gitlab grit version
```
  6af6f4b4
- Minor UI improvements and fixed test · 86bf684f
  Dmitriy Zaporozhets authored May 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  86bf684f
- Update sass-rails with newer version of rails. · ad5a982d
  Marin Jankovski authored May 08, 2014
  
  ad5a982d
- Fix a minor typo in the README · 700b6366
  Jeroen van Baarsen authored May 08, 2014
  
  700b6366
- Add assignee and milestone to 2nd step · 2da289cf
  Dmitriy Zaporozhets authored May 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2da289cf
- Remove unnecessary css margin · ee3cd06f
  Dmitriy Zaporozhets authored May 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ee3cd06f
- Add assignee/milestone block to merge request edit page. And remove branches... · 51e976d2
  Dmitriy Zaporozhets authored May 08, 2014
```
Add assignee/milestone block to merge request edit page. And remove branches selector from this page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  51e976d2
- Compare branches in MergeRequestsController#new action · 8eae01ea
  Dmitriy Zaporozhets authored May 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8eae01ea
- MergeRequest#new 2 step process · 05e63fe0
  Dmitriy Zaporozhets authored May 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  05e63fe0
- Add MergeRequest#target_project_namespace · 23de3551
  Dmitriy Zaporozhets authored May 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  23de3551
- Update rails to 4.0.5 · 5014a5b7
  Jacob Vosmaer authored May 08, 2014
  
  5014a5b7
- Indicate when to stop/start GitLab · 3bfbea37
  Jacob Vosmaer authored May 08, 2014
  
  3bfbea37
- Add an introcudtion to mysql_to_postgresql.md · 92591b63
  Jacob Vosmaer authored May 08, 2014
  
  92591b63
- Add fix for API when branch names have periods in them. Relates to issue... · da9b009d
  Sean Edge authored May 06, 2014
```
Add fix for API when branch names have periods in them.  Relates to issue #6128 (https://github.com/gitlabhq/gitlabhq/issues/6128).
```
  da9b009d
- Document how to convert a backup to PostgreSQL · c01efa0e
  Jacob Vosmaer authored May 08, 2014
  
  c01efa0e
- Update gitlab-grit to 2.6.6. · 5f74f051
  Marin Jankovski authored May 08, 2014
  
  5f74f051
07 May, 2014 13 commits
- Merge branch 'satellite-diff-collector' into 'master' · 3dea71ce
  Dmitriy Zaporozhets authored May 07, 2014
```
Add CompareAction class for collecting commits and diffs using satellites
```
  3dea71ce
- submit notes forms by pressing ctrl+enter · a8624cbe
  skv-headless authored May 07, 2014
  
  a8624cbe
- Add CompareAction class for collecting commits and diffs using satellites · 4fea8afc
  Dmitriy Zaporozhets authored May 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4fea8afc
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · dd3a5506
  Dmitriy Zaporozhets authored May 07, 2014
  
  dd3a5506
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · e652a753
  Dmitriy Zaporozhets authored May 07, 2014
  
  e652a753
- Merge branch 'ui-fixes' into 'master' · bcfa62b6
  Dmitriy Zaporozhets authored May 07, 2014
```
Ui fixes

* Fix merge request widget UI
* Improve jquery UI
* truncate long branch names on MR index
```
  bcfa62b6
- Fix check-all issues checkbox position · 97eb2240
  Dmitriy Zaporozhets authored May 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  97eb2240
- Merge pull request #6928 from ahmedshafeeq/patch-2 · 136683b1
  Dmitriy Zaporozhets authored May 07, 2014
```
Remove extra "Compile assets" section
```
  136683b1
- Merge branch 'fix_test' into 'master' · 02ae038c
  Dmitriy Zaporozhets authored May 07, 2014
```
Fixes failing test
```
  02ae038c
- truncate long branch names on MR index · 18529269
  Dmitriy Zaporozhets authored May 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  18529269
- Fix search dropdown css. Improve jquery styles · c9104fa6
  Dmitriy Zaporozhets authored May 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c9104fa6
- Unstub after the test is done. · 99e0d0dd
  Marin Jankovski authored May 07, 2014
  
  99e0d0dd
- Fix MR widget UI · fa7d0e3a
  Dmitriy Zaporozhets authored May 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fa7d0e3a