home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,678 Commits 48 Branches 340 Tags
c86865c1cf29cb39d0e2896351c3cf6c1925af6d
Commit Graph
18678 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher c86865c1cf Add missing 7.14.x CHANGELOG entries 2015-09-10 13:59:27 -04:00
Robert Schilling b8c05a069b Merge branch 'rescue-syntax-highlighting-errors' into 'master' 
Gracefully handle errors in syntax highlighting by leaving the block unformatted

A bug in Rouge caused an Exception:

```undefined method `sub' for :Literal:Symbol```

That caused https://gitlab.com/embeddable-common-lisp/ecl/issues/156 to hit Error 500 and fail to display. If a failure occurs, just render the text as preformatted.

Closes #2433

See merge request !1274
 2015-09-10 17:45:59 +00:00
Stan Hu 0a2c7fcc64 Merge pull request #9604 from bpetheo/bpetheo_add_service_api_endpoint_to_retrive_service_parameters 
Added service API endpoint to retrieve service parameters
 2015-09-10 10:40:37 -07:00
Petheo Bence 9bda4b8d88 Added service API endpoint to retrieve service parameters 2015-09-10 18:22:57 +02:00
Stan Hu 9d3344adbb Gracefully handle errors in syntax highlighting by leaving the block unformatted 
Closes #2433
 2015-09-10 09:16:27 -07:00
Dmitriy Zaporozhets 1c3c3ba512 Merge branch 'ui-improvements' into 'master' 
UI improvements

* Convert forked from button to text
* Refactor md variables
* Improve project fork page
* Style blob show page
* Style syntax highlight area for white theme

See merge request !1273
 2015-09-10 12:34:24 +00:00
Dmitriy Zaporozhets 059b8828d3 Style syntax highlight area for white theme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 13:36:42 +02:00
Dmitriy Zaporozhets b08c5521f5 Style blob show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 13:25:09 +02:00
Dmitriy Zaporozhets df51b029ab Improve project fork page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 13:14:25 +02:00
Dmitriy Zaporozhets 6933da1ee0 Refactor md variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 12:38:07 +02:00
Dmitriy Zaporozhets 86ef2eb728 Conver forked from button to text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 12:35:37 +02:00
Dmitriy Zaporozhets dadf6daac4 Merge branch 'disable-issue-autofill' into 'master' 
Turned off autocomplete for new issue titles

See merge request !1271
 2015-09-10 10:17:53 +00:00
Dmitriy Zaporozhets 32208c501a Merge branch 'fix-semaphore-twitter-identity-issue' into 'master' 
Update OmniAuth test to pass in Semaphore

This has caused all the build failures on GitHub master for the last few days. This change seems to pass Semaphore build on GitHub:

https://semaphoreci.com/stanhu/gitlabhq/branches/fix-semaphore-twitter-identity-issue-try2

Closes #2469

See merge request !1272
 2015-09-10 10:13:21 +00:00
Dmitriy Zaporozhets af3b6f6362 Fix fixed layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 09:52:02 +02:00
Stan Hu 253bc0ca15 Fix test 2015-09-10 00:19:53 -07:00
Robert Speicher 25f684e81d Merge pull request #9617 from dukex/patch-1 
Fix 7.14 stable branch name in upgrade docs

[ci skip]
 2015-09-09 18:36:05 -07:00
Duke 19cba632d8 fix 7.14 stable branch name 2015-09-09 21:20:51 -03:00
Dmitriy Zaporozhets a0359fbd77 Improve accounts page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 00:34:09 +02:00
Dmitriy Zaporozhets 4f0a9beb53 Merge branch 'ui-improvements' into 'master' 
Ui improvements

* allow containers without bg and border
* style twbs panels

See merge request !1270
 2015-09-09 22:21:38 +00:00
Dmitriy Zaporozhets afb68d2dae Merge branch 'nav-improvements' into 'master' 
Profile settings navigation improvements

* separate profile settings link
* get rid of double titles on profile page

See merge request !1269
 2015-09-09 22:19:59 +00:00
Darby def939a562 Turned off autocomplete for new issue titles 2015-09-09 15:04:38 -07:00
Dmitriy Zaporozhets 960a1880ab Fix last element of sidebar being hidden for small screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-09 23:49:34 +02:00
Dmitriy Zaporozhets 12ad9b4ba0 Enable blank container for group settings page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-09 23:38:27 +02:00
Dmitriy Zaporozhets 10b6a92481 Style panels and add blank container 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-09 23:29:19 +02:00
Dmitriy Zaporozhets 1e3ce07714 Use page title for header title too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-09 23:05:47 +02:00
Dmitriy Zaporozhets fa40759768 Separate profile settings link from the rest on sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-09 22:36:13 +02:00
Robert Speicher a81ce718c7 Merge branch 'rouge-patch' into 'master' 
Fix highlighting of deleted lines in diffs.

Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498

Only needed until https://github.com/jneen/rouge/pull/297 is merged into
Rouge and the gem is updated in GitLab.

Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an
option, since `gollum-lib` has `rouge` as a dependency, so it would get
included anyway, and which code we'd get would depend on the load order.

See merge request !1267
 2015-09-09 18:37:45 +00:00
Kamil Trzciński 3b610d9821 Merge branch 'issue-1952' into 'master' 
Fixed #1952 docker ssh connection times can be slow when UseDNS is enabled

See merge request !1208
 2015-09-09 16:42:16 +00:00
Dmitriy Zaporozhets 1ba26b4d1b Merge branch 'redis-session-expire-delay' into 'master' 
Fix reading session_expire_delay

The error occurs when application settings are not yet created and migrations are not yet done.

See merge request !1268
 2015-09-09 16:28:01 +00:00
Douwe Maan 0d41b2dd87 Merge branch 'fix-emojis-relative-url' into 'master' 
Fix emoji URLs in Markdown when relative_url_root is used

Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice.

Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:

RELATIVE_URL_ROOT=/gitlab rspec

Closes #1728

See merge request !1254
 2015-09-09 14:53:14 +00:00
Kamil Trzcinski 0d66d4d342 Fix reading session_expire_delay when application settings are not yet created and migrations are not yet done 2015-09-09 15:31:40 +01:00
Douwe Maan d3730b0713 Fix highlighting of deleted lines in diffs. 2015-09-09 14:54:34 +01:00
Dmitriy Zaporozhets 0d610270d9 Merge branch 'ui-improvements' into 'master' 
Fix UI bugs with discussions

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

See merge request !1265
 2015-09-09 09:47:48 +00:00
Dmitriy Zaporozhets c9d78a00c5 Fix UI bugs with discussions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-09 11:36:55 +02:00
Dmitriy Zaporozhets 5ff84deb3a Merge branch 'nginx-git-http' into 'master' 
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).

See merge request !1256
 2015-09-09 09:07:06 +00:00
Douwe Maan e8c8feb4b3 Merge branch 'add-meta-referrer-tag' into 'master' 
Add meta tag for referrer

https://gitlab.zendesk.com/agent/tickets/7054

Added a meta referrer tag, 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.

/cc @DouweM

See merge request !1263
 2015-09-09 08:59:26 +00:00
Dmitriy Zaporozhets b05cc8bc9a Merge branch 'global_labels' into 'master' 
Global labels

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

See merge request !1240
 2015-09-09 08:57:54 +00:00
Dmitriy Zaporozhets fbcde1aa77 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-09-09 09:20:48 +02:00
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
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
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