Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unused `stripSlashCommand` method32016-fix-slash-commands-detection | kushalpandya | 2017-05-12 | 2 | -24/+0 |
| | |||||
* | Add changelog entry | kushalpandya | 2017-05-12 | 1 | -0/+4 |
| | |||||
* | Simplify condition structure | kushalpandya | 2017-05-12 | 1 | -10/+8 |
| | |||||
* | Fix false negatives around slash commands | kushalpandya | 2017-05-12 | 2 | -5/+5 |
| | |||||
* | Update tests for new UI of temporary system notes | kushalpandya | 2017-05-12 | 1 | -4/+26 |
| | |||||
* | Make temporary slash command placeholder look like system note | kushalpandya | 2017-05-12 | 1 | -15/+46 |
| | |||||
* | Update as per review feedback | kushalpandya | 2017-05-12 | 1 | -9/+5 |
| | |||||
* | Fix slash commands handling on temporary notes | kushalpandya | 2017-05-12 | 2 | -50/+73 |
| | |||||
* | Merge branch 'sh-fix-failing-rc1-backup-spec' into 'master' | Stan Hu | 2017-05-12 | 1 | -1/+1 |
|\ | | | | | | | | | Fix failing backup filename spec for RCs See merge request !11318 | ||||
| * | Fix failing backup filename spec for RCssh-fix-failing-rc1-backup-spec | Stan Hu | 2017-05-11 | 1 | -1/+1 |
| | | | | | | | | See http://rubular.com/r/9oI7K8b773 for more details. | ||||
* | | Merge branch ↵ | Kamil Trzciński | 2017-05-12 | 2 | -1/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32103-last-scheduled-pipeline-link-only-showing-ci-status-icon' into 'master' Adds pipeline id to 'Last Pipeline' link in pipeline schedules Closes #32103 See merge request !11258 | ||||
| * | | Add pipeline id to Last Pipeline cell link.32103-last-scheduled-pipeline-link-only-showing-ci-status-icon | Bryce Johnson | 2017-05-11 | 2 | -1/+3 |
| | | | |||||
* | | | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' | Sean McGivern | 2017-05-12 | 12 | -99/+68 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Rework update_assignee_cache_counts Closes #31873 See merge request !11270 | ||||
| * | | | Move update_assignee_cache_counts to the service | Valery Sizov | 2017-05-12 | 12 | -99/+68 |
| | | | | |||||
* | | | | Merge branch 'acet-mr-widget-fix-link' into 'master' | Filipa Lacerda | 2017-05-12 | 6 | -9/+16 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | MRWidget: Fix target branch link. See merge request !11267 | ||||
| * | | | | MRWidget: Use targetBranchPath in everywhere.acet-mr-widget-fix-link | Fatih Acet | 2017-05-12 | 5 | -7/+6 |
| | | | | | |||||
| * | | | | MRWidget: Fix target branch link. | Fatih Acet | 2017-05-12 | 4 | -5/+13 |
| | | | | | |||||
* | | | | | Merge branch 'protected-branches-no-one-merge' into 'master' | Sean McGivern | 2017-05-12 | 7 | -29/+37 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled 'no one' as a merge access level in protected branches Closes #31541 See merge request !11232 | ||||
| * | | | | | Style changes to Ruby fileprotected-branches-no-one-merge | Phil Hughes | 2017-05-12 | 1 | -3/+7 |
| | | | | | | |||||
| * | | | | | Added model specs | Phil Hughes | 2017-05-12 | 2 | -0/+10 |
| | | | | | | |||||
| * | | | | | Enabled no-one as a merge access level in protected branches | Phil Hughes | 2017-05-10 | 5 | -29/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #31541 | ||||
* | | | | | | Merge branch '32178-prevent-merge-on-sha-change' into 'master' | Fatih Acet | 2017-05-12 | 10 | -0/+69 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "SHA mismatch" state to the MR widget Closes #32178 See merge request !11316 | ||||
| * | | | | | | add CHANGELOG.md entry for !1131632178-prevent-merge-on-sha-change | Mike Greiling | 2017-05-11 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | ensure hasSHAChanged == true when setData includes a different SHA from ↵ | Mike Greiling | 2017-05-11 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor | ||||
| * | | | | | | ensure the correct state component is loaded when hasSHAChanged == true | Mike Greiling | 2017-05-11 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | add test for sha-mismatch state component | Mike Greiling | 2017-05-11 | 1 | -0/+16 |
| | | | | | | | |||||
| * | | | | | | add sha-mismatch state to mr-widget to prevent accidental merges when branch ↵ | Mike Greiling | 2017-05-11 | 6 | -0/+24 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | unknowingly changes | ||||
* | | | | | | Merge branch 'backport_file_filder_from_ee' into 'master' | Sean McGivern | 2017-05-12 | 4 | -18/+55 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport FileFinder from EE Closes #32188 See merge request !11319 | ||||
| * | | | | | | Backport FileFinder from EEbackport_file_filder_from_ee | Valery Sizov | 2017-05-12 | 4 | -18/+55 |
| | | | | | | | |||||
* | | | | | | | Merge branch '30286-ci-badge-component' into 'master' | Phil Hughes | 2017-05-12 | 16 | -266/+213 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniform CI status components in vue Closes #30286 See merge request !11235 | ||||
| * | | | | | | | Uniform CI status components in vue | Filipa Lacerda | 2017-05-12 | 16 | -266/+213 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '32073-improve-function' into 'master' | Phil Hughes | 2017-05-12 | 1 | -18/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ci action icon function Closes #32073 See merge request !11291 | ||||
| * | | | | | | | Improve ci action icon function32073-improve-function | Filipa Lacerda | 2017-05-11 | 1 | -18/+13 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'remove-deltas-only' into 'master' | Sean McGivern | 2017-05-12 | 3 | -32/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deltas_only from DiffCollection Closes gitaly#224 See merge request !11285 | ||||
| * | | | | | | | | Remove deltas_only from DiffCollection | Jacob Vosmaer | 2017-05-11 | 3 | -32/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '31978-cross-reference-fix' into 'master' | Sean McGivern | 2017-05-12 | 3 | -6/+88 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross referencing for private and internal projects Closes #31978 See merge request !11243 | ||||
| * | | | | | | | | | Fix cross referencing for private and internal projects31978-cross-reference-fix | Jarka Kadlecova | 2017-05-11 | 3 | -6/+88 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '31650-fix-accessibility' into 'master' | Phil Hughes | 2017-05-12 | 5 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix accessibility issues for Input fields across GitLab Closes #31650 See merge request !11295 | ||||
| * | | | | | | | | | | Fix accessibility issues for Input fields across GitLab | Kushal Pandya | 2017-05-12 | 5 | -6/+9 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'remove-vue-from-poll_spec-fix-transient-failures' into 'master' | Filipa Lacerda | 2017-05-12 | 1 | -71/+22 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix poll_spec transient failures See merge request !11264 | ||||
| * | | | | | | | | | | Removed unneeded false from poll_spec mockServiceCall callremove-vue-from-poll_spec-fix-transient-failures | Luke "Jared" Bennett | 2017-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed promise action binding and simplified callbacks spy | Luke "Jared" Bennett | 2017-05-11 | 1 | -16/+11 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | improved mockservicecall and fixed up a settimeout | Luke "Jared" Bennett | 2017-05-11 | 1 | -32/+17 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed vue and vue-resource from poll_spec in an attempt to fix the ↵ | Luke "Jared" Bennett | 2017-05-10 | 1 | -58/+29 |
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | transient failures relating to async timeout | ||||
* | | | | | | | | | | Merge branch 'fixes_for_multiple_issue_assignees' into 'master' | Sean McGivern | 2017-05-12 | 12 | -44/+64 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for Follow-up from "Backport of Multiple Assignees feature Closes #31888 See merge request !11178 | ||||
| * | | | | | | | | | | fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assignees | Valery Sizov | 2017-05-11 | 12 | -44/+64 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'refactor-realtime-issue' into 'master' | Filipa Lacerda | 2017-05-12 | 17 | -262/+543 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored issue tealtime elements See merge request !11242 | ||||
| * | | | | | | | | | | Fixed karma spec with elements not appearing in DOMrefactor-realtime-issue | Phil Hughes | 2017-05-11 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Remove some weird code to add/remove the task status | Phil Hughes | 2017-05-11 | 5 | -45/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the data into the data method Renamed edited ago class name | ||||
| * | | | | | | | | | | Merge branch 'master' into refactor-realtime-issue | Phil Hughes | 2017-05-11 | 286 | -707/+1715 |
| |\ \ \ \ \ \ \ \ \ \ |