Commits · 0fbd6244ec8d06376b4130a4832dd77ce207fc5f · Kazuhiko Shiozaki / gitlab-ce

07 Sep, 2015 6 commits

Merge branch 'annotate-models' into 'master' · 0fbd6244
Dmitriy Zaporozhets authored Sep 07, 2015
```
Re-annotate models

See merge request !1253
```
0fbd6244

Merge branch 'url-builder-fix-for-relative-urls' into 'master' · 14805d6f

Dmitriy Zaporozhets authored Sep 07, 2015

Fix URL construction for merge requests, issues, notes, and commits for relative URL config

This MR fixes the constructor of URL links for systems using relative URLs in the application config. The `host` parameter was used improperly, supplying an extra path (e.g. https://mydomain.com/gitlab) and unnecessary scheme. We should be able to default to the URL options set in `8_default_url_options.rb` file.

Closes https://github.com/gitlabhq/gitlabhq/issues/9605

See merge request !1250

14805d6f

Merge branch 'fix-wiki-page-history' into 'master' · 662cf2ce

Douwe Maan authored Sep 07, 2015

Fix broken Wiki Page History

This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.

Closes #2104

Closes #1751

Closes #1592

Closes https://github.com/gitlabhq/gitlabhq/issues/9399

See merge request !1232

662cf2ce

Merge branch 'rs-dev-issue-2466' into 'master' · b9df4998

Douwe Maan authored Sep 07, 2015

Remove style attribute from textarea during ZenMode activation

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466

Closes https://github.com/gitlabhq/gitlabhq/issues/8963

See merge request !1248

b9df4998

Merge branch 'rs-highlight-new-notes' into 'master' · af35fc8c
Douwe Maan authored Sep 07, 2015
```
Add syntax highlight scheme to notes rendered client-side

See merge request !1249
```
af35fc8c

Merge branch 'upgrade-redis-required-check' into 'master' · 8bd419d9

Marin Jankovski authored Sep 07, 2015

Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957

Closes #2222

Closes #2445

See merge request !1251

8bd419d9

06 Sep, 2015 4 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
- Re-annotate models · d7812a95
  Stan Hu authored Sep 06, 2015
  
  d7812a95
- 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
- Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957 · 30039dae
  Stan Hu authored Sep 06, 2015
```
Closes #2222

Closes #2445
```
  30039dae
04 Sep, 2015 24 commits
- Fix URL construction for merge requests, issues, notes, and commits for relative URL config · a5314e79
  Stan Hu authored Sep 04, 2015
```
Closes https://github.com/gitlabhq/gitlabhq/issues/9605
```
  a5314e79
- Remove style attribute from textarea during ZenMode activation · 38f1d571
  Robert Speicher authored Sep 04, 2015
```
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
```
  38f1d571
- Add syntax highlight scheme to notes rendered client-side · cc22a264
  Robert Speicher authored Sep 04, 2015
  
  cc22a264
- 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 6 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