Commits · 84df1bb4670b369baa24ef719babfbfe07e74d36 · nexedi / gitlab-ce

29 Dec, 2014 1 commit
- Custom header logo · 84df1bb4
  Drew Blessing authored Dec 29, 2014
  
  84df1bb4
26 Dec, 2014 3 commits

Merge branch 'ee-from-ce' into 'master' · bdac5ddd

Dmitriy Zaporozhets authored Dec 26, 2014

CE changes from master

Sidebar navigation, OAuth and other changes from CE

See merge request !275

bdac5ddd

Fix EE UI for new layout · 01f7734f
Dmitriy Zaporozhets authored Dec 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
01f7734f

Merge branch 'master' into ee-from-ce · fd1f54b8

Dmitriy Zaporozhets authored Dec 26, 2014

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

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md

fd1f54b8

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 19 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
- Merge branch 'updated-git-packages' into 'master' · 4f0d2d33
  Job van der Voort authored Dec 24, 2014
```
Updated Packages with git fix

See merge request !274
```
  4f0d2d33
- Added the new 7.6 packages links · 0b4b9e43
  Patricio Cano authored Dec 24, 2014
  
  0b4b9e43
- 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
- Link to LDAP doc. · cdd8adcb
  Sytse Sijbrandij authored Dec 24, 2014
  
  cdd8adcb
- 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
- Fix scroll problems and disable authorized_only filter · 97d7c06f
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  97d7c06f
- Note what has to be updated for new packages. · b3198b61
  Sytse Sijbrandij authored Dec 24, 2014
  
  b3198b61
- Improvements to issues/mr filters: · 7b792af8
  Dmitriy Zaporozhets authored Dec 24, 2014
```
* use filter_params variable when set filter values
* fix project issues spinach tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7b792af8
- Refactor issuable list pages · 016981c0
  Dmitriy Zaporozhets authored Dec 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  016981c0
- Merge branch 'update-release-steps' into 'master' · 2df09c64
  Sytse Sijbrandij authored Dec 24, 2014
```
Update release steps

Updated release steps to mention that packages should be built the day before release and that the blog post should mention CI changes.

See merge request !1348
```
  2df09c64
23 Dec, 2014 1 commit
- Updated the monthly release steps · 4386c210
  Patricio Cano authored Dec 23, 2014
  
  4386c210