delta/gitlab/gitlab-ce.git/spec/javascripts/fixtures/merge_requests.rb, branch remove-commit-tree gitlab.com: gitlab-org/gitlab-ce.git Hide close MR button after merge without reloading page 2017-09-24T10:42:29+00:00 Jacopo beschi.jacopo@gmail.com 2017-09-07T20:25:50+00:00 e05031304913f333d7c1443956091fb306e7a6b3 After merging a MR the close button is hidden, without reloading the page. 
After merging a MR the close button is hidden, without reloading the page.
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2017-09-03T21:09:59+00:00 Jose Ivan Vargas jvargas@gitlab.com 2017-09-03T21:09:59+00:00 b623807682022a54344d8213d6f1c902be6ade37 






Cleaning up repositories for javascript fixture specs to work correctly
2017-08-30T18:22:48+00:00

Gabriel Mazetto
brodock@gmail.com

2017-08-22T23:19:35+00:00

a882026bdfc770ecfac70bfc88a409ec010f06c9

We need to cleanup after each execution so we can still re-use the same
paths and prevent collision with the on disk validation





We need to cleanup after each execution so we can still re-use the same
paths and prevent collision with the on disk validation







Merge branch 'master' into issue-discussions-refactor
2017-08-11T23:17:48+00:00

Filipa Lacerda
filipa@gitlab.com

2017-08-11T23:17:48+00:00

e93214bce63518b31532d9406d00703aa2ef2d26

* 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.
  ...





* 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.
  ...







Enable the RSpec/HookArgument cop and auto-correct offenses
2017-08-10T23:29:42+00:00

Robert Speicher
rspeicher@gmail.com

2017-08-10T22:31:42+00:00

c8b802471bcb6ea9ea7af3c7a139598a1f945230












Change fixtures of old tests
2017-08-10T15:48:22+00:00

Filipa Lacerda
filipa@gitlab.com

2017-08-10T15:48:22+00:00

d323bb79ebc84751cc0a27e99db7ae1c2ec64fd8












Ensure all project factories use `:repository` trait or `:empty_project`
2017-08-01T18:51:52+00:00

Robert Speicher
rspeicher@gmail.com

2017-08-01T18:51:52+00:00

9513bd18c43b749c8856d6ad89635d97c8fb73b5












Split up MergeRequestsController
2017-06-28T23:17:44+00:00

Douwe Maan
douwe@selenight.nl

2017-06-13T22:12:31+00:00

70b05a83772abc59b3c914c84bc4d2c07749884d












Fix linking to line number on parallel diff creating empty discussion
2017-06-21T15:16:06+00:00

Eric Eastwood
contact@ericeastwood.com

2017-06-21T06:36:08+00:00

5145e39ef7efe7618a2f78a63e13bc630be251a9

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010





Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010







Fix MR "Changes" diff note up arrow to edit last note
2017-06-20T05:31:21+00:00

Eric Eastwood
contact@ericeastwood.com

2017-06-20T05:18:27+00:00

f7ad9e5abbfd0916a4f93e22d97cbdac17c46986

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





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