Commit Graph

41 Commits

Author SHA1 Message Date
GitLab Bot 8c9cb9bb57 Add latest changes from gitlab-org/gitlab@master 2023-03-28 21:29:23 +00:00
GitLab Bot 9bf40d9fdc Add latest changes from gitlab-org/gitlab@master 2022-09-29 12:08:49 +00:00
GitLab Bot 8c2d06cba7 Add latest changes from gitlab-org/gitlab@master 2022-07-29 15:12:25 +00:00
GitLab Bot 875662ef7b Add latest changes from gitlab-org/gitlab@master 2022-06-01 12:09:17 +00:00
GitLab Bot 68e6b85dfa Add latest changes from gitlab-org/gitlab@master 2022-05-31 00:09:17 +00:00
GitLab Bot 9b8aeacf0e Add latest changes from gitlab-org/gitlab@master 2022-04-11 15:09:47 +00:00
GitLab Bot 79d6dbbd46 Add latest changes from gitlab-org/gitlab@master 2022-02-17 15:18:08 +00:00
GitLab Bot 4abacac9af Add latest changes from gitlab-org/gitlab@master 2021-09-28 15:11:30 +00:00
GitLab Bot b2180a27bc Add latest changes from gitlab-org/gitlab@master 2021-06-02 09:09:46 +00:00
GitLab Bot 232e7582b0 Add latest changes from gitlab-org/gitlab@master 2021-02-22 15:10:48 +00:00
GitLab Bot 8b0ef13236 Add latest changes from gitlab-org/gitlab@master 2020-06-03 18:08:28 +00:00
GitLab Bot 6168721025 Add latest changes from gitlab-org/gitlab@master 2020-02-07 00:09:12 +00:00
GitLab Bot db24ab2b72 Add latest changes from gitlab-org/gitlab@master 2020-01-28 12:08:44 +00:00
Vitali Tatarintev 6a6411938a Change `be_success` to `be_successful` in specs
Fixes deprecation warning:

```
DEPRECATION WARNING: The success? predicate is deprecated and
will be removed in Rails 6.0.
Please use successful? as provided by Rack::Response::Helpers.
```
2019-08-19 14:40:56 +02:00
Peter Leitzen 7b87ed1499 Cleanup usages of `JSON.parse` in specs
Prefer `json_response` where applicable.
2019-07-16 08:03:49 +00:00
Stan Hu 5d74c95c98 Check that source and target branch exist
This ensures the return value is consistent if the source and/or
branch do not exist.
2019-04-18 22:01:51 -03:00
gfyoung 93a44e135b Add some frozen string to spec/**/*.rb
Adds frozen string to the following:

* spec/bin/**/*.rb
* spec/config/**/*.rb
* spec/controllers/**/*.rb

xref https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-04-15 10:17:05 +00:00
blackst0ne b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
Stan Hu 22d7c1379f Reject invalid branch names in repository compare controller
Closes #51003
2018-10-08 13:32:31 -07:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Marc 0aa1f53d10 Add signature verification badge to compare view 2018-05-07 08:41:36 +00:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Jacopo 2f40dac352 Refactor `have_http_status` into `have_gitlab_http_status` in the specs 2017-10-20 10:13:18 +02:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Douwe Maan ad640bc5f9 Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
Robert Speicher 4642ca6686 Use `empty_project` where possible in controller specs 2017-01-25 17:14:38 -05:00
Martin Cabrera 87c39b6d39 Added specs for the preservation of the from/to parameter 2017-01-15 02:28:01 +01:00
Martin Cabrera 6972a35fec Added specs for branches compare when from & to are empty 2017-01-10 23:46:32 +01:00
tiagonbotelho 519275c110 fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
Paco Guzman 8f359ea917 Move to Gitlab::Diff::FileCollection
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
2016-08-03 07:00:20 +02:00
Paco Guzman cd7c2cb6dd Cache highlighted diff lines for merge requests
Introducing the concept of SafeDiffs which relates 
diffs with UI highlighting.
2016-08-03 07:00:19 +02:00
Sean McGivern 5266ae87c4 Support renames in diff_for_path actions 2016-07-11 09:31:34 +01:00
Sean McGivern e462e12278 Tidy up spec action names 2016-07-08 18:11:47 +01:00
Sean McGivern b6b26692ea Collapse large diffs by default
When rendering a list of diff files, skip those where the diff is over
10 KB and provide an endpoint to render individually instead.
2016-07-08 10:56:55 +01:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses
Also removes the note from the development/testing.md guide
2016-05-24 15:40:29 -04:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Minsik Yoon 3d0efa8e0a Add ignore white space option in merge request diff
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
Stan Hu de8497ca56 Fix Error 500 when comparing non-existing branches
Closes #2593
2015-09-18 12:02:01 -07:00
Stan Hu 359ed48638 Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00
Stan Hu ee92dd1683 Unescape branch names in compare commit
Closes #1399
Closes https://github.com/gitlabhq/gitlabhq/issues/9105
2015-04-30 12:44:46 -07:00