Commit Graph
18676 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 187face620 CLeanup CI helpers since we dont use oauth any more 2015-09-11 13:15:18 +02:00
Dmitriy Zaporozhets ae5d2f5b31 Fix Ci::Ansi2html spec 2015-09-11 13:10:37 +02:00
Dmitriy Zaporozhets 0615de013d Fix ci commits features specs 2015-09-11 13:05:31 +02:00
Dmitriy Zaporozhets a8dd4d36e2 Fix build features specs 2015-09-11 12:52:56 +02:00
Dmitriy Zaporozhets 9a9417ee8e Fix more tests 2015-09-10 18:12:14 +02:00
Dmitriy Zaporozhets dc2e38e56d Config does not exists any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 17:27:17 +02:00
Dmitriy Zaporozhets c1de46dbc7 Fix project pages for authorized user 2015-09-10 17:14:55 +02:00
Dmitriy Zaporozhets 4e7b47dde1 Convert ci features specs to v3 2015-09-10 16:56:21 +02:00
Valery Sizov e5042137db Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-10 17:55:36 +03:00
Valery Sizov 6db2843bc2 fix of project creation 2015-09-10 17:54:09 +03:00
Dmitriy Zaporozhets 762a23f268 Remove CI css that exists in GitLab 2015-09-10 16:37:04 +02:00
Valery Sizov f5af4efabd fix runners page 2015-09-10 17:05:43 +03:00
Dmitriy Zaporozhets 9d93c567b3 Fix part of CI api tests 2015-09-10 16:04:06 +02:00
Dmitriy Zaporozhets bf8013f1a4 Fix most of project specs 2015-09-10 15:56:33 +02:00
Dmitriy Zaporozhets 59c3a3239f Fix commit specs 2015-09-10 15:52:52 +02:00
Dmitriy Zaporozhets 10b3c85e2c Fix some issues with ci models specs 2015-09-10 15:47:15 +02:00
Valery Sizov 381180bc27 remove gitlab_ci config 2015-09-10 13:42:41 +03:00
Valery Sizov 44261a5d9f integration with gitlab auth 2015-09-09 17:36:01 +03:00
Dmitriy Zaporozhets 81f9ee48b1 Fix mysql migration 2015-09-09 16:08:09 +02: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
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
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
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
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