home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,630 Commits 48 Branches 340 Tags
349054e0ab4b03c9e259ed342af6cbb4e22936cd
Commit Graph
18630 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan Hu 349054e0ab Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-08 22:59:08 -07:00
Stan Hu 2b137f0875 Merge pull request #9538 from szechyjs/feature/fogbugz 
Fogbugz importer
 2015-09-08 22:58:24 -07:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Robert Speicher 1d5fe20ee2 Merge branch 'rs-bump-gitlab-shell' into 'master' 
Bump gitlab-shell to v2.6.5

[ci skip]

See merge request !1264
 2015-09-08 18:22:44 +00:00
Robert Speicher 4d6f8a6aee Bump gitlab-shell to v2.6.5 2015-09-08 13:34:07 -04:00
Dmitriy Zaporozhets 86556a079e Improve diff UI and mr compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 17:22:26 +02:00
Dmitriy Zaporozhets e9cf79da2f Style merge request page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 16:42:18 +02:00
Dmitriy Zaporozhets 4651155881 Make system note different from regular comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 16:11:41 +02:00
Dmitriy Zaporozhets 70aecc34cf Improve commit page style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 15:40:14 +02:00
Dmitriy Zaporozhets 2fde90a2c2 Fix small font size for diff comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 15:35:25 +02:00
Dmitriy Zaporozhets 99bbbb5c30 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-08 15:04:22 +02:00
Dmitriy Zaporozhets 7fe6d11a3d Move group member title to header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 15:02:51 +02:00
Dmitriy Zaporozhets 4ac9dcc2d2 Merge branch 'issue-redesign' into 'master' 
Issue redesign

* new issue UI
* fixed small font in issue/mr list

See merge request !1258
 2015-09-08 09:45:07 +00:00
Dmitriy Zaporozhets 925d392682 Make comment form bigger 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 11:21:33 +02:00
Dmitriy Zaporozhets 1e1376f230 Style milestones 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 11:14:48 +02:00
Dmitriy Zaporozhets 0250bab8e9 Style wiki pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 10:23:09 +02:00
Dmitriy Zaporozhets 4bea030c88 Style system notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 10:12:14 +02:00
Dmitriy Zaporozhets def4d8b906 Improve issue/mr title and description styles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 09:58:43 +02:00
Dmitriy Zaporozhets 1240a7e065 Improve font size on issues/mr list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 09:32:06 +02:00
Dmitriy Zaporozhets 31fc6b26d8 Style comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 01:47:36 +02:00
Dmitriy Zaporozhets 6887075b2e Style issue page, comments and part of merge request page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 01:25:51 +02:00
Dmitriy Zaporozhets 243bfc975e Small restyle of issue and merge request pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 22:04:23 +02:00
Dmitriy Zaporozhets e0da2c3523 Merge branch 'ui-improvements' into 'master' 
Ui improvements

* fix project home page when activity set as default
* style commits, branches and tags pages to new style
* render flash message outside of content block
* style group pages

See merge request !1255
 2015-09-07 14:17:00 +00:00
Dmitriy Zaporozhets 2b31989582 Fix compare tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 14:55:42 +02:00
Valery Sizov 954dd7ce87 Merge branch 'crowd' into 'master' 
Crowd integration

https://dev.gitlab.org/gitlab/gitlabhq/issues/2217

See merge request !1228
 2015-09-07 11:20:03 +00:00
Dmitriy Zaporozhets 700a342e0d Restyle group pages. Merge header with page title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 13:18:11 +02:00
Dmitriy Zaporozhets dad163b7ee Style project milestones page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 12:52:53 +02:00
Dmitriy Zaporozhets 183562bc35 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 12:45:06 +02:00
Valery Sizov 9836017c70 satisfy rubocop 2015-09-07 13:15:27 +03:00
Dmitriy Zaporozhets 0fbd6244ec Merge branch 'annotate-models' into 'master' 
Re-annotate models

See merge request !1253
 2015-09-07 09:58:51 +00:00
Dmitriy Zaporozhets 11f815ac1e Render flash message out of content block 2015-09-07 11:58:19 +02:00
Dmitriy Zaporozhets 14805d6f5c Merge branch 'url-builder-fix-for-relative-urls' into 'master' 
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
 2015-09-07 09:57:05 +00:00
Dmitriy Zaporozhets aa6d29f0a7 Style commits, branches and tags pages to match new UI 2015-09-07 11:44:00 +02:00
Douwe Maan 662cf2cef4 Merge branch 'fix-wiki-page-history' into 'master' 
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
 2015-09-07 09:27:48 +00:00
Douwe Maan b9df499860 Merge branch 'rs-dev-issue-2466' into 'master' 
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
 2015-09-07 09:20:00 +00:00
Dmitriy Zaporozhets 6c1d5c5c9c Fix project page with activity as default home page 2015-09-07 11:10:40 +02:00
Douwe Maan af35fc8c25 Merge branch 'rs-highlight-new-notes' into 'master' 
Add syntax highlight scheme to notes rendered client-side

See merge request !1249
 2015-09-07 09:09:37 +00:00
Marin Jankovski 8bd419d9c8 Merge branch 'upgrade-redis-required-check' into 'master' 
Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957

Closes #2222

Closes #2445

See merge request !1251
 2015-09-07 07:39:58 +00:00
Robert Schilling 66eca7d3ba Merge branch 'fix-extra-slash-in-gitlab-shell-doc' into 'master' 
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
 2015-09-06 15:41:19 +00:00
Stan Hu d7812a95cf Re-annotate models 2015-09-06 07:48:48 -07:00
Stan Hu fd6eba34eb 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
```
 2015-09-06 07:41:23 -07:00
Stan Hu 30039dae63 Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957 
Closes #2222

Closes #2445
 2015-09-06 00:35:16 -07:00
Stan Hu a5314e79f2 Fix URL construction for merge requests, issues, notes, and commits for relative URL config 
Closes https://github.com/gitlabhq/gitlabhq/issues/9605
 2015-09-04 16:24:01 -07:00
Robert Speicher 38f1d571fe Remove style attribute from textarea during ZenMode activation 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
 2015-09-04 18:01:36 -04:00
Robert Speicher cc22a2640f Add syntax highlight scheme to notes rendered client-side 2015-09-04 17:07:24 -04:00
Dmitriy Zaporozhets 50f76ae0ea Merge branch 'ui-improvements' into 'master' 
Style project home page

Also make header more compact

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

See merge request !1246
 2015-09-04 20:22:36 +00:00
Dmitriy Zaporozhets 9793c3460f Make project page and header more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 21:36:56 +02:00
Dmitriy Zaporozhets ac6dfbd91c Make header and sidebar avatar more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 21:21:31 +02:00
Stan Hu e8bbc83771 Merge pull request #9598 from darkrasid/master 
Add image content-type header in raw download
 2015-09-04 07:49:01 -07:00
Dmitriy Zaporozhets 670544c8fa Style project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 16:14:16 +02:00