Commits · 38d8d749d73921f370ec8ff28e19f2a5fb7e6f34 · iv / gitlab-ce · GitLab

15 Jan, 2014 1 commit
- Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq · 38d8d749
  Dmitriy Zaporozhets authored Jan 15, 2014
  
  38d8d749
14 Jan, 2014 30 commits
- Merge pull request #6050 from jvanbaarsen/regex-fix · 9a1d0c17
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Allow . files to be created
```
  9a1d0c17
- Revert "Fix deprecation in specs" · fb0b9329
  Dmitriy Zaporozhets authored Jan 14, 2014
```
This reverts commit 414ead57.
```
  fb0b9329
- Increase max height of select2 · 3efbdbfd
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3efbdbfd
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · d87d46f9
  Dmitriy Zaporozhets authored Jan 14, 2014
  
  d87d46f9
- More styling to select2 · eba8aa74
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  eba8aa74
- Merge pull request #6056 from nburkley/patch-2 · a809dbf5
  Sytse Sijbrandij authored Jan 14, 2014
```
Fixing Link to Contributing guide
```
  a809dbf5
- Move sort dropdown to the right · ea9ea3fe
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ea9ea3fe
- Fix issues selects · e19d05dd
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e19d05dd
- Fixing Link to Contributing guide · ff8f8eae
  nburkley authored Jan 14, 2014
```
Link was a 404, added missing '/' in url
```
  ff8f8eae
- Add sort dropdown to merge requests list · 2940785c
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2940785c
- Move issues sort dropdown to shared partial · 2c071314
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2c071314
- Move issues sort logic to Issuable concern · b85e4d3c
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b85e4d3c
- Merge pull request #6053 from zzet/patch-6 · adf6ee09
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Fix deprecation in specs
```
  adf6ee09
- Merge pull request #6054 from zzet/patch-7 · fafa1a2c
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Remove Debug from tests
```
  fafa1a2c
- Add login and remember_me to devise permit list · 0c637acb
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0c637acb
- Increase width of issue filter field · 688af57d
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  688af57d
- Add hr below mr title · 2e79f830
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2e79f830
- Remove Debug from tests · fe3f7f53
  Andrew Kumanyaev authored Jan 14, 2014
  
  fe3f7f53
- Fix deprecation in specs · 414ead57
  Andrew Kumanyaev authored Jan 14, 2014
```
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)>'.
```
  414ead57
- Dont allow merge without commit message · 99a2b31e
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  99a2b31e
- Allow . files to be created · cc1f7ea2
  Jeroen van Baarsen authored Jan 14, 2014
```
Fixes: https://github.com/gitlabhq/gitlabhq/issues/5770
```
  cc1f7ea2
- Merge branch 'no-options' of /home/git/repositories/gitlab/gitlabhq · 71f1a845
  Dmitriy Zaporozhets authored Jan 14, 2014
  
  71f1a845
- Merge branch 'improve/side_filters' of /home/git/repositories/gitlab/gitlabhq · 85a6fe4b
  Dmitriy Zaporozhets authored Jan 14, 2014
  
  85a6fe4b
- Add note about not wanting unneeded options. · 82aaa897
  dosire authored Jan 14, 2014
  
  82aaa897
- Improve side filters and make them look similar · 8b513fbc
  Dmitriy Zaporozhets authored Jan 14, 2014
  
  8b513fbc
- Merge pull request #6038 from jvanbaarsen/fix-5767 · 5a52c9b0
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Fix for #5767
```
  5a52c9b0
- Merge pull request #6041 from estrai/head-panel-data-original-title-fixup · 798f82f4
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Set correct data-original-title value for my snippets
```
  798f82f4
- Tests for accept MR with custom message · 92474901
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  92474901
- Fix mr controller specs · 09d5868c
  Dmitriy Zaporozhets authored Jan 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  09d5868c
- Set correct data-original-title value for my snippets · 6ecda0f4
  Daniel Lukasiak authored Jan 14, 2014
  
  6ecda0f4
13 Jan, 2014 9 commits
- Fix for #5767 · d5bb466f
  Jeroen van Baarsen authored Jan 13, 2014
```
In the branch graph, uploaded images where not rendered
correctly. Fixed this by not filling the rect, instead
i've put an image over it
```
  d5bb466f
- Use default bootstrap pills · 55024ed1
  Dmitriy Zaporozhets authored Jan 13, 2014
  
  55024ed1
- Add UI for custom Merge request commit message · 0de6e2da
  Dmitriy Zaporozhets authored Jan 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0de6e2da
- Merge pull request #6032 from sinm/patch-1 · 3f71f2fa
  Dmitriy Zaporozhets authored Jan 13, 2014
```
It's a bad idea to use hash symbol in a yaml value without quotes
```
  3f71f2fa
- Use params[:merge_commit_message] in MergeRequestController for automerge · 87814591
  Dmitriy Zaporozhets authored Jan 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  87814591
- MergeRequest#automerge accepts custom message now.... · db966364
  Dmitriy Zaporozhets authored Jan 13, 2014
```
MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_message generate default one
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  db966364
- Add merge_commit_message argument for Satellite::MergeAction#merge · d84b0fa6
  Dmitriy Zaporozhets authored Jan 13, 2014
  
  d84b0fa6
- Use same code for diff and patch inside MergeAction · 6a800832
  Dmitriy Zaporozhets authored Jan 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6a800832
- Add support of custom message to merge action of satellite · 7c6287c8
  Dmitriy Zaporozhets authored Jan 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7c6287c8