Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Strip trailing whitespaces in submodule URLssh-fix-submodules-trailing-spaces | Stan Hu | 2017-05-29 | 1 | -0/+1 |
| | | | | | | | | Users attempting to access repositories that had `.gitmodules` entries with trailing whitespaces would encounter an Error 500. This was due to a change in bf876ec7 that quietly removed the whitespace stripping. Closes #33018 | ||||
* | Fix: Milestone - Participants list is showing duplicate assigneesfix_duplicated_assignees_on_milestone_page | Valery Sizov | 2017-05-29 | 1 | -1/+1 |
| | |||||
* | Replace "build" with "job" | Fabio Busatto | 2017-05-26 | 1 | -3/+3 |
| | | | Close #32994 | ||||
* | Merge branch 'apply-same-responsive-notes-to-parallel-diff' into 'master' | Annabel Dunstone Gray | 2017-05-26 | 4 | -33/+42 |
|\ | | | | | | | | | Apply responsive note styles to parallel diffs See merge request !11701 | ||||
| * | Apply responsive note styles to parallel diffsapply-same-responsive-notes-to-parallel-diff | Eric Eastwood | 2017-05-26 | 4 | -33/+42 |
| | | | | | | | | | | Fix inspired while working on https://gitlab.com/gitlab-org/gitlab-ce/issues/32801 | ||||
* | | Enable DuplicateProperty scss-lint | Annabel Dunstone Gray | 2017-05-26 | 9 | -8/+2 |
| | | |||||
* | | Merge branch ↵ | Fatih Acet | 2017-05-26 | 4 | -3/+18 |
|\ \ | |/ |/| | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558 | ||||
| * | Fallback to false when remove_source_branch is null. | Bryce Johnson | 2017-05-25 | 1 | -1/+1 |
| | | |||||
| * | Merge branch ↵ | Bryce Johnson | 2017-05-25 | 1 | -0/+1 |
| |\ | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' of gitlab.com:gitlab-org/gitlab-ce into 32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project | ||||
| | * | Expose remove_source_branch boolean/null | Oswaldo Ferreira | 2017-05-24 | 1 | -0/+1 |
| | | | |||||
| * | | Update shouldRemoveSourceBranch against API entity changes. | Bryce Johnson | 2017-05-25 | 1 | -3/+1 |
| |/ | |||||
| * | Shush eslint. | Bryce Johnson | 2017-05-22 | 1 | -1/+1 |
| | | |||||
| * | Upgrade Remove Source Branch checkbox UX. | Bryce Johnson | 2017-05-22 | 3 | -3/+19 |
| | | |||||
* | | More consistent padding of notes, system notes, and note form | Douwe Maan | 2017-05-26 | 8 | -54/+75 |
| | | |||||
* | | Creates CI Header component to use in pipelines and job details pages | Filipa Lacerda | 2017-05-26 | 3 | -0/+198 |
| | | |||||
* | | Merge branch 'enable-final-newline' into 'master' | Clement Ho | 2017-05-26 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Enable final newline See merge request !11723 | ||||
| * | | Enable final newline ruleenable-final-newline | Annabel Dunstone Gray | 2017-05-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dm-consistent-last-push-event' into 'master' | Robert Speicher | 2017-05-26 | 20 | -74/+63 |
|\ \ \ | | | | | | | | | | | | | | | | | Consistently display last push event widget See merge request !11585 | ||||
| * | | | Make section connect with window border without extra padding | Douwe Maan | 2017-05-25 | 9 | -29/+35 |
| | | | | |||||
| * | | | Kill copy button with 🔥 | Douwe Maan | 2017-05-25 | 1 | -4/+2 |
| | | | | |||||
| * | | | Consistently display last push event widget | Douwe Maan | 2017-05-25 | 18 | -56/+41 |
| | | | | |||||
* | | | | Merge branch 'fix_counter_cache_invalidation' into 'master' | Douwe Maan | 2017-05-26 | 6 | -2/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix counter cache invalidation Closes #32854 and #32870 See merge request !11736 | ||||
| * | | | | Fix counters cache invalidation for Issues and Merge Requests | Valery Sizov | 2017-05-26 | 5 | -0/+5 |
| | | | | | |||||
| * | | | | Set "expire_in" for counters cache | Valery Sizov | 2017-05-26 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'issuable-form-create-label-sub-groups' into 'master' | Filipa Lacerda | 2017-05-26 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed create new label form in issue form not working for sub-group projects Closes #32906 See merge request !11703 | ||||
| * | | | | | Fixed create new label form in issue form not working for sub-group projectsissuable-form-create-label-sub-groups | Phil Hughes | 2017-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #32906 | ||||
* | | | | | | Merge branch '31448-jira-urls' into 'master' | Grzegorz Bizon | 2017-05-26 | 1 | -12/+25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API URL to JIRA settings Closes #31448 See merge request !11707 | ||||
| * | | | | | | Add API URL to JIRA settings31448-jira-urls | Jarka Kadlecova | 2017-05-26 | 1 | -12/+25 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into ↵ | Clement Ho | 2017-05-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error thrown with missing note fragment in DOM Closes #32888 See merge request !11700 | ||||
| * | | | | | Fix error thrown with missing note fragment in DOM32888-fix-error-after-missing-note-hash-fragment-in-dom | Eric Eastwood | 2017-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32888 Reproduction: 1. Visit /namespace/project/merge_requests/x/diffs#note_1234 1. When `#note_1234` isn't in the diff, an error is thrown | ||||
* | | | | | | Set emoji-menu z-index to 200 | Luke "Jared" Bennett | 2017-05-26 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Resolve "Resolved discussions icon is misaligned" | Luke "Jared" Bennett | 2017-05-26 | 1 | -1/+9 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'dm-diff-cleanup' into 'master' | Robert Speicher | 2017-05-25 | 27 | -229/+177 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Clean up diff rendering See merge request !11390 | ||||
| * | | | | Address feedback | Douwe Maan | 2017-05-25 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Change code comment formattingdm-diff-cleanup | Douwe Maan | 2017-05-23 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Remove @commit in compare and MR controllers | Douwe Maan | 2017-05-23 | 3 | -11/+4 |
| | | | | | |||||
| * | | | | Pass fallback_diff_refs to Diff::File instead of using view helpers | Douwe Maan | 2017-05-23 | 14 | -80/+49 |
| | | | | | |||||
| * | | | | Clean up diff rendering | Douwe Maan | 2017-05-23 | 13 | -134/+121 |
| | | | | | |||||
| * | | | | Consistently style image in blob and diff | Douwe Maan | 2017-05-23 | 3 | -3/+2 |
| | | | | | |||||
| * | | | | Add question mark to Gitlab::Diff::File predicate methods | Douwe Maan | 2017-05-23 | 7 | -32/+32 |
| | | | | | |||||
* | | | | | Merge branch 'issue_19262' into 'master' | Douwe Maan | 2017-05-25 | 1 | -2/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent commits from upstream repositories to be re-processed by forks Closes #19262 See merge request !11511 | ||||
| * | | | | | Remove unecessary commit pattern check | Felipe Artur | 2017-05-25 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Prevent commits from upstream repositories to be re-processed by forks | Felipe Artur | 2017-05-22 | 1 | -0/+13 |
| | | | | | | |||||
* | | | | | | Merge branch 'winh-label-textcolor-default' into 'master' | Grzegorz Bizon | 2017-05-25 | 2 | -3/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide default for calculating label text color Closes #32728 See merge request !11681 | ||||
| * | | | | | | Provide default for calculating label text color (!11681) | winh | 2017-05-25 | 2 | -3/+6 |
| | | | | | | | |||||
* | | | | | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master' | Douwe Maan | 2017-05-25 | 2 | -6/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix: Always use the default language when generating emails. Closes #32748 See merge request !11662 | ||||
| * | | | | | | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-language | Ruben Davila | 2017-05-25 | 2 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition issue when the application was generating an email and was using a language that was previously being used in other request. | ||||
* | | | | | | | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into ↵ | Annabel Dunstone Gray | 2017-05-25 | 2 | -3/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note header author and time ago wrapping in parallel diff Closes #32801 See merge request !11702 | ||||
| * | | | | | | | | Fix note header author and time ago wrapping in parallel diff32801-fix-discussion-header-wrapping-in-parallel-diff | Eric Eastwood | 2017-05-25 | 2 | -3/+8 |
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801 | ||||
* | | | | | | | | Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master' | Phil Hughes | 2017-05-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtered search issuable empty state exception Closes #31455 See merge request !11347 |