Commits · 66eca7d3ba90d88c7214c1ac305788919708f688 · Kazuhiko Shiozaki / gitlab-ce

06 Sep, 2015 2 commits

Merge branch 'fix-extra-slash-in-gitlab-shell-doc' into 'master' · 66eca7d3

Robert Schilling authored Sep 06, 2015

Use File.join to prevent extra slash in help message from appearing. Before:

```
Try fixing it:
sudo -u git -H /opt/gitlab/embedded/service/gitlab-shell//bin/create-hooks
```

See merge request !1252

66eca7d3

Use File.join to prevent extra slash in help message from appearing. Before: · fd6eba34
Stan Hu authored Sep 06, 2015
```
```
Try fixing it:
sudo -u git -H /opt/gitlab/embedded/service/gitlab-shell//bin/create-hooks
```
```
fd6eba34

04 Sep, 2015 21 commits
- Merge branch 'ui-improvements' into 'master' · 50f76ae0
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Style project home page

Also make header more compact

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

See merge request !1246
```
  50f76ae0
- Make project page and header more compact · 9793c346
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9793c346
- Make header and sidebar avatar more compact · ac6dfbd9
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ac6dfbd9
- Merge pull request #9598 from darkrasid/master · e8bbc837
  Stan Hu authored Sep 04, 2015
```
Add image content-type header in raw download
```
  e8bbc837
- Style project home page · 670544c8
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  670544c8
- Merge branch 'ui-improvements' into 'master' · 69beca5a
  Dmitriy Zaporozhets authored Sep 04, 2015
```
UI improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1245
```
  69beca5a
- Fix this crazy random failing test · aa75e76a
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aa75e76a
- REmove icons from milestone filters · bc6706fd
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bc6706fd
- Dont render merge request target branch in list · 43394f0a
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  43394f0a
- Apply new style for issues, merge requests and milestone pages · 147f95b7
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  147f95b7
- Style dashboard milestones page · cf36509a
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cf36509a
- Fix stars align · 0362a0f0
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0362a0f0
- Fix failing test · 8b5a14fd
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8b5a14fd
- Small ui improvements to activity feed · 8301836b
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8301836b
- Fix fonts for assets · af6f739f
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  af6f739f
- Event feed use gl-padding var · dc86a919
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dc86a919
- Merge branch 'ui-improvements' · 20647f03
  Dmitriy Zaporozhets authored Sep 04, 2015
  
  20647f03
- Make UI more compact · c13ef898
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c13ef898
- Add awesome font SourceSansPro · 16e6913e
  Dmitriy Zaporozhets authored Sep 04, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  16e6913e
- Merge branch 'fix-services-doc-generation' into 'master' · f92b1cb0
  Douwe Maan authored Sep 04, 2015
```
Fix `rake services:doc` generation

From: https://github.com/gitlabhq/gitlabhq/pull/9604#issuecomment-137539926

See merge request !1243
```
  f92b1cb0
- add Content-Type header of raw image file · 4144c599
  pilsner authored Sep 03, 2015
```
Add Content-Type header to fix a bug which IE can't show image in
markdown when the image is from raw.

	modified:   CHANGELOG
	modified:   app/controllers/projects/raw_controller.rb
	modified:   spec/controllers/projects/raw_controller_spec.rb
```
  4144c599
03 Sep, 2015 17 commits
- Fix `rake services:doc` generation · a7304432
  Stan Hu authored Sep 03, 2015
```
[ci skip]
```
  a7304432
- Merge branch 'ui-improvements' into 'master' · 996f5155
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Ui improvements

* show page context title instead of `Dashboard` keyword
* fix event feed overflow
* remove annoying tooltips where its not needed
* fix tests broken in previous mr

See merge request !1242
```
  996f5155
- Fix tests · 858675ff
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  858675ff
- Fix tests · c2a9e6ea
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c2a9e6ea
- Set page title based on content in dashboard area · 0145e8ea
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0145e8ea
- Fix even feed title overflow · b0082738
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b0082738
- Replace obvious tooltips. Fix line-height for top nav · d0a58027
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d0a58027
- Fix tab toggle on activity · ce9cb516
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ce9cb516
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · d44f6974
  Dmitriy Zaporozhets authored Sep 03, 2015
  
  d44f6974
- Merge branch 'ui-improvements' into 'master' · ae7fd8b2
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Collection of fixes and improvements to GitLab UI

* new design colors
* new font size
* change padding and size of form inputs
* new activity page
* new groups page
* new explore projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @skyruler

See merge request !1239
```
  ae7fd8b2
- Improve explore proojects page · 211e7750
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  211e7750
- Improve starred and trending pages · b7427faa
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b7427faa
- Refactor colors · 1c8ec154
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1c8ec154
- New UI for explore groups and trending pages · 89df4a79
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  89df4a79
- Style groups page · 0195b085
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0195b085
- Merge pull request #9591 from bozaro/user-by-key · aaef30aa
  Douwe Maan authored Sep 03, 2015
```
Add API method for get user by ID of an SSH key
```
  aaef30aa
- Change some base colors in UI · aeeb31d6
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aeeb31d6