home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Patricio Cano 983a102bd0 Added meta tag for referrer, so that only the origin is sent to third party sites, instead of the entire URL, thus avoiding the leak of sensitive information like password reset tokens. 2015-09-08 12:28:28 -05:00
Robert Speicher df1f4433c5 Merge branch 'mr-xss' into 'master' 
Escape user-provided content in preserved HAML sections

See merge request !1927
 2015-09-08 17:17:37 +00:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Douwe Maan 0e9ba0a4fa Add attributes to LDAP::Config. 2015-09-08 17:34:18 +01: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
Douwe Maan c915e2c823 Allow configuration of LDAP attributes GitLab will use for the new user account. 2015-09-08 16:18:14 +01: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
Douwe Maan 1489d225d6 Move partial to right place and fix tests. 2015-09-08 15:14:14 +01: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
Douwe Maan 5d785457db Clean up overlap between dashboard and explore. 
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
 2015-09-08 14:49:20 +01:00
Douwe Maan 260fcd4520 Consistently case Back to X links. 2015-09-08 14:43:41 +01:00
Douwe Maan d92696d39d Link to help from signin page bottom. 2015-09-08 14:42:39 +01:00
Douwe Maan c258e97747 Make Help accessible for guests. 2015-09-08 14:42:30 +01: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
Douwe Maan 9f31f95ada Escape user-provided content in preserved HAML sections 2015-09-08 11:18:55 +01: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
Jacob Vosmaer 783791fd08 The good stuff needs NGINX 1.7.11 2015-09-07 14:59:32 +02: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
Jacob Vosmaer 8d59b1ac45 Do not let NGINX buffer Git HTTP requests 
Before this change NGINX would convert a chunked HTTP POST (e.g.
git push) into a HTTP 1.0 single large POST. This creates an
unnecessary delay, and it creates unnecessary memory pressure on
gitlab-git-http-server.

For the response ('proxy_buffering') I am less sure that NGINX 's
buffering behavior is harmful, but it still makes more sense to me
not to interfere with gitlab-git-http-server (and the Golang net/http
server).
 2015-09-07 13:05:29 +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
Stan Hu 8820785c8f Fix emoji URLs in Markdown when relative_url_root is used 
Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:

RELATIVE_URL_ROOT=/gitlab rspec

Closes #1728
 2015-09-06 09:46:10 -07: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