Commits · faab452af92dbdbdb45d399fc5bbe85bb345cb9d · Kirill Smelkov / gitlab-ce

28 Dec, 2014 1 commit
- Remove unneeded password_confirmation from seed. · faab452a
  Ciro Santilli authored Sep 27, 2014
  
  faab452a
27 Dec, 2014 4 commits
- Merge branch 'fix-ui-milestone' into 'master' · c8bb1716
  Dmitriy Zaporozhets authored Dec 27, 2014
```
Improve UI for milestone pages

See merge request !1356
```
  c8bb1716
- Dont check for milestone description on group milestone page · b8bffc0d
  Dmitriy Zaporozhets authored Dec 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b8bffc0d
- Improve UI for group milestone and project milestone pages · 4adc0337
  Dmitriy Zaporozhets authored Dec 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4adc0337
- Merge branch 'dashboard-fix-assignee' into 'master' · 80597d59
  Dmitriy Zaporozhets authored Dec 27, 2014
```
Dashboard: fix assignee filter and remove some old code

See merge request !1354
```
  80597d59
26 Dec, 2014 8 commits
- Show assigned issues/mr be default on dashboard · 465f1869
  Dmitriy Zaporozhets authored Dec 26, 2014
```
This was default before but now it fixed with providing assignee_id
parameter making url shareble and dont reset when other filters users.

Also this commit removes old methods that are not used any more.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  465f1869
- Merge branch 'ui-changes' into 'master' · a7b7a2dd
  Dmitriy Zaporozhets authored Dec 26, 2014
```
UI changes

Set of UI fixes for side nav

See merge request !1352
```
  a7b7a2dd
- Fix no-ssh message for non logged in user · aa54482a
  Dmitriy Zaporozhets authored Dec 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aa54482a
- set z-index for navbar and sidebar explicitly · 573d554c
  Dmitriy Zaporozhets authored Dec 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  573d554c
- Fix links for no-ssh message · a248efad
  Dmitriy Zaporozhets authored Dec 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a248efad
- Fix UI for no-ssh-key message · f1c39763
  Dmitriy Zaporozhets authored Dec 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f1c39763
- Make nprogress color to red · 038161f4
  Dmitriy Zaporozhets authored Dec 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  038161f4
- Put nprogress spinner to bottom left position · e3951019
  Dmitriy Zaporozhets authored Dec 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e3951019
25 Dec, 2014 16 commits

New CHANGELOG items · b01c5d99
Dmitriy Zaporozhets authored Dec 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
b01c5d99
Merge branch 'oauth2_provider' into 'master' · ed932d82
Dmitriy Zaporozhets authored Dec 25, 2014
```
Oauth2 provider

Please update #1713

See merge request !1346
```
ed932d82
Fix nav_link support for several path options · d2bd5e83
Dmitriy Zaporozhets authored Dec 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d2bd5e83

Merge branch 'master' into oauth2_provider · f9ece12e

Dmitriy Zaporozhets authored Dec 25, 2014

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml

f9ece12e

Fix tests and add message if no oauth apps · aadfb366
Dmitriy Zaporozhets authored Dec 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
aadfb366

Rework oauth2 feature · 592e3968

Dmitriy Zaporozhets authored Dec 25, 2014

* improve UI
* add authorization
* add separate page for oauth applications
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

592e3968

Improve code style · 7fe8d41d
Dmitriy Zaporozhets authored Dec 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7fe8d41d

Merge branch 'ui-improvements' into 'master' · 64286985

Dmitriy Zaporozhets authored Dec 25, 2014

UI improvements

Set of UI changes mostly for issue and merge request

* return edit/close buttons to old position (right of title)
* make 'Issue #1' header smaller
* move mr commits to separate tab
* change inline/side diff switcher to buttons from tabs
* make issue sidebar start with dicsussion block

See merge request !1351

64286985

Align sidebar navigation differently · 40ff1bc8
Dmitriy Zaporozhets authored Dec 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
40ff1bc8

Fix tests · fca161f5

Dmitriy Zaporozhets authored Dec 25, 2014

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

fca161f5

Small UI imporovement for merge request accept widget and projects page · 99e52c9a
Dmitriy Zaporozhets authored Dec 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
99e52c9a
Merge branch 'master' into ui-improvements · 7c5bf937
Dmitriy Zaporozhets authored Dec 25, 2014

7c5bf937
Improve issue/mr page for tablets · 88b48017
Dmitriy Zaporozhets authored Dec 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
88b48017

Set of UI changes mostly for issue and merge request · 5140a4cd

Dmitriy Zaporozhets authored Dec 25, 2014

* return edit/close buttons to old position (right of title)
* make 'Issue #1' header smaller
* move mr commits to separate tab
* change inline/side diff switcher to buttons from tabs
* make issue sidebar start with dicsussion block
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

5140a4cd

Merge branch 'fold-sidenav' into 'master' · e46f546b
Dmitriy Zaporozhets authored Dec 25, 2014
```
Fold sidenav for mobile devices

Fold sidebar for xs and sm displays.

See merge request !1350
```
e46f546b
Fold sidebar for mobile devices and expand for desktop · f0d0b193
Dmitriy Zaporozhets authored Dec 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
f0d0b193

24 Dec, 2014 11 commits
- fold-subnav class for folded sidebar navigation. Dashboard and project nav adopted · b4e6dec8
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b4e6dec8
- Fix layout if broadcast message enabled · fe104386
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fe104386
- convert erb to haml · a61ccd4a
  Valery Sizov authored Dec 24, 2014
  
  a61ccd4a
- Hide rack profiler by default · 63be1600
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  63be1600
- Doorkeeper integration · e41dadcb
  Valery Sizov authored Dec 19, 2014
  
  e41dadcb
- Merge branch 'project-path' into 'master' · 5cf2bd4c
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Project path

Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763

See merge request !1337
```
  5cf2bd4c
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · fe68c45a
  Dmitriy Zaporozhets authored Dec 24, 2014
  
  fe68c45a
- Merge branch 'sidebar-nav' into 'master' · dc24b4d7
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Sidebar navigation

This MR changes layout of the GitLab to sidebar navigation.

Layouts:

- [x] Project layout
- [x] Project settings layout
- [x] Dashboard layout
- [x] Profile layout
- [x] Group layout
- [x] Snippets layout
- [x] Admin layout

Pages:

- [x] Activity pages
- [x] Issue/mr pages
- [x] Issues/merge requests pages

Common:

- [x] Fix tests

See merge request !1329
```
  dc24b4d7
- Fix spinach tests · 35eec009
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  35eec009
- Fix diff comments · 8045d96e
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8045d96e
- Merge branch 'package-dependencies' into 'master' · 2dece41b
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Package dependencies documentation

/cc @valery @patricio

See merge request !1349
```
  2dece41b