home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +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
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
karen Carias 6a1d695f86 made info more clear 2015-09-09 15:17:41 -07: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
Valery Sizov 44261a5d9f integration with gitlab auth 2015-09-09 17:36:01 +03: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
Dmitriy Zaporozhets 81f9ee48b1 Fix mysql migration 2015-09-09 16:08:09 +02:00
Douwe Maan d3730b0713 Fix highlighting of deleted lines in diffs. 2015-09-09 14:54:34 +01:00
Dmitriy Zaporozhets 1f0fa156b5 Copy ci yml config before tests 2015-09-09 15:46:21 +02:00
Dmitriy Zaporozhets d516b02eb4 Fix brakeman 2015-09-09 15:41:21 +02:00
Dmitriy Zaporozhets 870f553bf3 Fix spinach exception 2015-09-09 15:32:20 +02:00
Dmitriy Zaporozhets fefa98b21a Make rspec start 2015-09-09 15:08:01 +02:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets 90c338a495 Move helpers back to original directory 2015-09-09 14:37:34 +02:00
Dmitriy Zaporozhets cc4ef4da11 Refactor CI tests 2015-09-09 14:17:16 +02:00
Dmitriy Zaporozhets 76c6aeb9bc Merge CI factories and CI spec/support with GitLab 2015-09-09 13:37:50 +02:00
Douwe Maan 3b89a68302 Move source section below omnibus section. 2015-09-09 12:11:08 +01:00
Douwe Maan d8795297fa Restructure omnibus instructions to match those for source installations. 2015-09-09 12:10:47 +01:00
Douwe Maan 2c8d5aeaf3 Merge branch 'master' into reply-by-email-docs 2015-09-09 12:01:38 +01:00
Douwe Maan bed263f0fe Add to changelog 2015-09-09 11:54:55 +01:00
Douwe Maan 00ecacf8ea Add to docs 2015-09-09 11:54:48 +01:00
Douwe Maan c52fee70d0 Test overriding LDAP attributes 2015-09-09 11:51:40 +01:00
Douwe Maan 909a8443c6 Shuffle config around a bit 2015-09-09 11:40:31 +01:00
Douwe Maan 9c6ed29664 Expand explanation in config file 2015-09-09 11:36:08 +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
Douwe Maan e4b30f9db3 Fix help access spec 2015-09-09 10:22:19 +01: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
Douwe Maan 89f166021f Fix snippets exploration test 2015-09-09 09:29:42 +01:00
Douwe Maan 5c961b9cc5 Fix spec 2015-09-09 09:28:09 +01:00
Valery Sizov b7431ec042 Make all group public 2015-09-09 11:27:03 +03:00
Douwe Maan be59f4338f Fix RootController 2015-09-09 09:25:49 +01:00
Valery Sizov 3d6fed54f0 fix Gemfile 2015-09-09 11:06:35 +03: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
karen Carias 4743b8bd6a link to rake tasks 2015-09-08 18:36:11 -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