- 21 Apr, 2017 1 commit
-
-
Jacopo authored
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs. Removed unnecessary usage of `api:true`
-
- 19 Apr, 2017 1 commit
-
-
Douglas Barbosa Alexandre authored
-
- 06 Apr, 2017 1 commit
-
-
Jose Ivan Vargas Lopez authored
-
- 07 Mar, 2017 1 commit
-
-
Grzegorz Bizon authored
-
- 02 Mar, 2017 1 commit
-
- 16 Feb, 2017 1 commit
-
-
Sean McGivern authored
There were two problems here: 1. On the JS side, the reference to $widgetBody didn't refer to the right DOM element any more. This might be because it was replaced by the `getMergeStatus` method. Even if it wasn't, ensuring we have the right element means that the content gets updated. 2. On the Ruby side, the `log_merge_error` method didn't update the `merge_error` column of the merge request. Change that to update if requested, and update in the most common cases by default. Additionally, this would sometimes return an error hash, but it doesn't look like this was ever used (the return value of `MergeService#execute` appears to be unused everywhere).
-
- 08 Feb, 2017 1 commit
-
-
Phil Hughes authored
-
- 03 Feb, 2017 1 commit
-
-
Phil Hughes authored
Ported from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1154
-
- 26 Jan, 2017 1 commit
-
-
Phil Hughes authored
-