Commit graph

14 commits

Author SHA1 Message Date
Jose Ivan Vargas
b623807682 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2017-09-03 16:09:59 -05:00
Gabriel Mazetto
a882026bdf Cleaning up repositories for javascript fixture specs to work correctly
We need to cleanup after each execution so we can still re-use the same
paths and prevent collision with the on disk validation
2017-08-30 20:22:48 +02:00
Filipa Lacerda
e93214bce6 Merge branch 'master' into issue-discussions-refactor
* master: (66 commits)
  fix confidential border issue as well as confidential styles leaking on new MR
  Migrate force push check to Gitaly
  Add option to disable project export on instance
  Better categorize test coverage results
  Add option to disable project export on instance - db changes
  Better caching and indexing of broadcast messages
  Include the `is_admin` field in the `GET /users/:id` API when current user is an admin
  Document rspec-retry and rspec-flaky
  Fix cop description
  Retrieve and sync flaky specs report from and to S3
  Use a new RspecFlakyListener to detect flaky specs
  Fix formatting of patch_versions.md [skip ci]
  Enable Timecop safe mode
  Show error message for API 500 error in tests, and
  Fix merge request diff deserialisation when too_large was absent
  Delete correct key from `session` after authenticating using U2F
  Bumps omniauth-ldap gem version to 2.0.4
  Pending delete projects no longer return 500 error in Admins projects view
  Do not run the `ee_compat_check` job for stableish branches
  Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
  ...
2017-08-12 00:17:48 +01:00
Robert Speicher
c8b802471b Enable the RSpec/HookArgument cop and auto-correct offenses 2017-08-10 19:29:42 -04:00
Filipa Lacerda
d323bb79eb Change fixtures of old tests 2017-08-10 16:48:22 +01:00
Robert Speicher
9513bd18c4 Ensure all project factories use :repository trait or :empty_project 2017-08-01 14:51:52 -04:00
Douwe Maan
70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00
Eric Eastwood
5145e39ef7 Fix linking to line number on parallel diff creating empty discussion
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
2017-06-21 10:16:06 -05:00
Eric Eastwood
f7ad9e5abb Fix MR "Changes" diff note up arrow to edit last note
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868

While in a MR "Changes" tab looking at some diff note discussions.
Clicking reply and pressing the up-arrow should edit your last comment in
that discussion.

I suspect this regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178
where we changed the selector
2017-06-20 00:31:21 -05:00
Phil Hughes
ee01ebd9e4 Fixed UP arrow key not editing last comment in discussion
Closes #31348
2017-05-08 14:31:11 +01:00
Simon Knox
3cc806ee13 tests for success and failure of deleting branch from MR page 2017-04-13 22:25:08 +10:00
Eric Eastwood
880b53e0b4 Reset container width when switching to pipelines MR tab
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
2017-03-28 10:59:54 -05:00
Douwe Maan
ad640bc5f9 Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
winniehell
fc7d2a88f4 Replace static fixture for merge_request_tabs_spec.js (!9172) 2017-02-13 00:29:39 +01:00