Commit graph

19 commits

Author SHA1 Message Date
GitLab Bot
999f47e9e6 Add latest changes from gitlab-org/gitlab@master 2020-08-12 12:10:25 +00:00
GitLab Bot
757d2fda7e Add latest changes from gitlab-org/gitlab@master 2020-06-26 21:08:51 +00:00
GitLab Bot
4f5c8572e9 Add latest changes from gitlab-org/gitlab@master 2020-06-16 18:09:01 +00:00
GitLab Bot
4e375367b7 Add latest changes from gitlab-org/gitlab@master 2019-12-07 00:07:51 +00:00
GitLab Bot
143f196f8b Add latest changes from gitlab-org/gitlab@master 2019-11-18 18:06:53 +00:00
GitLab Bot
29c01c6c91 Add latest changes from gitlab-org/gitlab@master 2019-11-14 03:06:25 +00:00
GitLab Bot
759cd6c298 Add latest changes from gitlab-org/gitlab@master 2019-09-26 09:06:04 +00:00
Thong Kuah
73e848850c Add frozen_string_literal to spec/features
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:23:30 +12:00
Thong Kuah
595a092a08 Fix frozen string error 2019-07-25 21:33:18 +12:00
Kamil Trzciński
2d9e0f3ffb Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"
This reverts merge request !26853
2019-06-14 13:17:18 +00:00
Heinrich Lee Yu
96ed5a8bd7 Upgrade to Capybara 3
Fix whitespace in specs because normalize_ws is slightly
different from Capybara 2 behavior
2019-06-12 18:40:18 +08:00
Mike Scott
852738a498 Add Pipeline IID to views
* Add Pipeline IID to MR's
* Add Pipeline IID to commit box
* Add Pipeline IID to builds page
* Add Pipeline IID to job sidebar
* Add Pipeline IID to header on view pipeline pages
* Add changelog entry
* Update tests
2019-05-30 09:32:20 +00:00
Francisco Javier López
5a3e6fdff9
Fixing image lfs bug and also displaying text lfs
This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812,
fixes a problem creating a displaying image diff notes when the image
is stored in LFS. The main problem was that `Gitlab::Diff::File` was
returning an invalid valid in `text?` for this kind of files.

It also fixes a rendering problem with other LFS files, like text
ones. They LFS pointer shouldn't be shown when LFS is enabled
for the project, but they were.
2018-12-27 16:51:07 +01:00
Cindy Pallares
e3a5ce58bb
Merge branch 'security-bvl-exposure-in-commits-list' into 'master'
[master] Don't expose confidential information in commit message list

See merge request gitlab/gitlabhq!2626
2018-11-28 19:09:23 -05:00
Luke Bennett
362e9e40b1
fix user_browses_commits_spec 2018-07-20 13:25:31 +01:00
Mark Chao
a63bce1a4b Resolve "Rename the Master role to Maintainer" Backend 2018-07-11 14:36:08 +00:00
Semyon Pupkov
d0c854bd2e Replace commits spinach tests with RSpec analog
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2018-05-04 16:34:58 +05:00
Eric Eastwood
1faaf6ffbc Fix 500 when visiting a commit where blobs do not exist (nil blobs)
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491
2018-01-09 16:51:53 -06:00
blackst0ne
96e0020c70 Replace 'project/user_lookup.feature' spinach test with an rspec analog 2017-08-30 09:31:26 +11:00