Commits · 8310b4589d0216cf7bb12eeee97785c3372690d9 · Léo-Paul Géneau / gitlab-ce · GitLab

26 Dec, 2013 8 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 8310b458
  Dmitriy Zaporozhets authored Dec 26, 2013
  
  8310b458
- bump gitlab_git · 3df417b8
  Dmitriy Zaporozhets authored Dec 26, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3df417b8
- Merge pull request #5928 from skv-headless/master · 19c2c90c
  Dmitriy Zaporozhets authored Dec 26, 2013
```
Fix warnings
```
  19c2c90c
- Merge branch 'refactor/notes' of /home/git/repositories/gitlab/gitlabhq · 7bf0add0
  Dmitriy Zaporozhets authored Dec 26, 2013
  
  7bf0add0
- Add User#email uniq validation. Fixed confirmation for admin/users form · 4cd7a563
  Dmitriy Zaporozhets authored Dec 26, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4cd7a563
- Fix User#by_username_or_id for postgres · a389d777
  Dmitriy Zaporozhets authored Dec 26, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a389d777
- Fix file upload for edit note. Better style for discussion form · 5f7db3e9
  Dmitriy Zaporozhets authored Dec 26, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5f7db3e9
- fix tests · d4ec23b8
  Dmitriy Zaporozhets authored Dec 26, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d4ec23b8
25 Dec, 2013 14 commits
- Improve tests and make preview for notes · 21b028b5
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  21b028b5
- Remove old methods and classes · 9305ef89
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9305ef89
- Update commentable controllers with new note vars · f554aa38
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f554aa38
- Switch Notes controller to use json · 48c682b5
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  48c682b5
- Write new Notes coffee class to handle comments · 923bd2ec
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  923bd2ec
- fix warnings · a443a198
  skv authored Dec 25, 2013
  
  a443a198
- Merge branch 'session_store' of /home/git/repositories/gitlab/gitlabhq · c797493e
  Dmitriy Zaporozhets authored Dec 25, 2013
  
  c797493e
- Make note anchors actually work · f7e7dc7e
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f7e7dc7e
- Enable secure option if https is used. · c447a213
  Marin Jankovski authored Dec 25, 2013
  
  c447a213
- Improve FilterContext tests · 73af33e4
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  73af33e4
- Improve dev fixtures · 34f994b7
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  34f994b7
- Refactor FilterContext · 1e64333c
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1e64333c
- Fix per-project counters for Dashboard filters · 1a2e11c8
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1a2e11c8
- Include scope in dashboard filters · f6a4e563
  Dmitriy Zaporozhets authored Dec 25, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f6a4e563
24 Dec, 2013 14 commits
- Merge branch 'feature/all_merge_requets' of /home/git/repositories/gitlab/gitlabhq · 16ea2ec1
  Dmitriy Zaporozhets authored Dec 24, 2013
  
  16ea2ec1
- Tests for Dashboard#issues filter · b1970e0c
  Dmitriy Zaporozhets authored Dec 24, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b1970e0c
- Add tests to Dashboard#merge_requests filter · 4c61c467
  Dmitriy Zaporozhets authored Dec 24, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4c61c467
- Merge branch 'refactor/scss' of /home/git/repositories/gitlab/gitlabhq · a16d7558
  Dmitriy Zaporozhets authored Dec 24, 2013
  
  a16d7558
- Show Assigned/Authored/All filter for dashboard issues and mr pages · 5953582b
  Dmitriy Zaporozhets authored Dec 24, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5953582b
- use .body instaed of .ui-box-body · 0c0beec2
  Dmitriy Zaporozhets authored Dec 24, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0c0beec2
- Merge branch 'improve/avatar_upload_only_images' of /home/git/repositories/gitlab/gitlabhq · ce527b68
  Dmitriy Zaporozhets authored Dec 24, 2013
  
  ce527b68
- Merge branch 'confirmation_protection' of /home/git/repositories/gitlab/gitlabhq · ede3446c
  Dmitriy Zaporozhets authored Dec 24, 2013
  
  ede3446c
- Use new ui-box classes · dac67ed6
  Dmitriy Zaporozhets authored Dec 24, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dac67ed6
- Refactor UI boxes. Split issue box to different class · 4345e922
  Dmitriy Zaporozhets authored Dec 24, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4345e922
- Confirmation url throttle. · f537e4c9
  Marin Jankovski authored Dec 24, 2013
  
  f537e4c9
- Add User#avatar_type tests · 62f1c977
  Dmitriy Zaporozhets authored Dec 24, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  62f1c977
- Merge pull request #5922 from jhollingsworth/fix/rake-routes · dc5bd10d
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Fixed issue with `bundle exec rake routes` not running.
```
  dc5bd10d
- Fixed issue with `bundle exec rake routes` not running. · 405492e9
  Jason Hollingsworth authored Dec 23, 2013
```
Wrap regex comments in (?#comment) construct.
```
  405492e9
23 Dec, 2013 4 commits
- Dont allow upload of non-image formats for user avatar · e6f83399
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e6f83399
- Mention that Upgrader works for 6.4.2 · 055b3c4d
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  055b3c4d
- No tabs, only 2 spaces · 84ec2263
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  84ec2263
- Add 6.4.1 and 6.4.2 CHANGELOG · 1443d510
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1443d510