summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add view spec for more_actions_dropdown render branchesLuke "Jared" Bennett2017-06-161-18/+17
* [ci skip] Correct rendering more actions dropdown when there are no actions a...Luke "Jared" Bennett2017-06-161-2/+6
* Correct 'report as abuse' nesting in _more_actions_dropdown.html.hamlLuke "Jared" Bennett2017-06-161-4/+4
* Update _more_actions_dropdown.html.haml to only show 'Edit comment' when user...Luke "Jared" Bennett2017-06-161-5/+7
* Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-marginTim Zallmann2017-06-161-2/+2
|\
| * fix frontend test failures after jasmine upgradekarma-headless-chrome-reduxMike Greiling2017-06-151-2/+2
* | Update ruby metrics endpoint text to be clearerJoshua Lambert2017-06-151-2/+3
* | Merge branch 'feature/unify-email-layouts' into 'master'Robert Speicher2017-06-1511-294/+153
|\ \
| * | gitlab.com contrib footer only for devise mailsAlexis Reigel2017-06-132-15/+18
| * | inline the only once used templateAlexis Reigel2017-06-132-5/+3
| * | add contribution footer to all emailsAlexis Reigel2017-06-131-0/+16
| * | use common devise layout and use heading styleAlexis Reigel2017-06-1310-292/+118
| * | add view helper for mail headingAlexis Reigel2017-06-131-0/+13
| * | use common layout for devise mailerAlexis Reigel2017-06-133-23/+23
| * | add layout for default email contentAlexis Reigel2017-06-131-0/+3
* | | Merge branch 'deserialize-custom-notifications' into 'master'Robert Speicher2017-06-153-22/+33
|\ \ \
| * | | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-153-7/+29
| * | | Add columns for custom notification settingsSean McGivern2017-06-151-18/+7
* | | | Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master'Annabel Dunstone Gray2017-06-151-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix file diff title and renames alignment in discussions31782-fix-diff-discussion-file-title-misalignmentEric Eastwood2017-06-141-2/+3
* | | | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-153-3/+4
* | | | Merge branch '23998-blame-age-map' into 'master'Annabel Dunstone Gray2017-06-155-3/+95
|\ \ \ \
| * | | | Add blame view age mapJeff Stubler2017-06-145-3/+95
| | |_|/ | |/| |
* | | | Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-151-2/+2
|\ \ \ \
| * | | | Do not show manual actions that cannot be runfix-manual-actionsKamil Trzcinski2017-06-131-2/+2
* | | | | Merge branch 'backport-merge_params-conflict-message-to-ce-master' into 'master'Sean McGivern2017-06-151-1/+2
|\ \ \ \ \
| * | | | | Improve conflict message in _merge_params.html.hamlLuke "Jared" Bennett2017-06-141-1/+2
| * | | | | Backport merge_params.html.haml conflict commentLuke "Jared" Bennett2017-06-141-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-151-3/+25
|\ \ \ \ \
| * | | | | Fix note highlight being lost after real time updateEric Eastwood2017-06-141-3/+25
| |/ / / /
* | | | | Merge branch '32861-fix-milestone-drag-and-drop-assignees' into 'master'Phil Hughes2017-06-151-10/+14
|\ \ \ \ \
| * | | | | Fix milestone page assignees when dropped in ongoing listEric Eastwood2017-06-141-10/+14
| |/ / / /
* | | | | Merge branch 'dm-target-branch-slash-command-desc' into 'master'Robert Speicher2017-06-141-1/+1
|\ \ \ \ \
| * | | | | Update /target_branch slash command description to be more consistentdm-target-branch-slash-command-descDouwe Maan2017-06-141-1/+1
* | | | | | Remove extra line so that it is consistent with EEClement Ho2017-06-141-1/+0
* | | | | | Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix autocomplete not working on note edit formEric Eastwood2017-06-141-1/+1
| |/ / / /
* | | | | Merge branch 'pipelines-row-vue-file-fix' into 'master'Annabel Dunstone Gray2017-06-141-1/+1
|\ \ \ \ \
| * | | | | Fixed pipelines Vue template not ending correctlypipelines-row-vue-file-fixPhil Hughes2017-06-141-1/+1
| |/ / / /
* | | | | Merge branch 'winh-select2-remove-token' into 'master'Annabel Dunstone Gray2017-06-141-2/+4
|\ \ \ \ \
| * | | | | Move remove token of Select2 to the rightwinh2017-06-141-2/+4
| | |_|/ / | |/| | |
* | | | | Merge branch '31263-fix-fenced-code-misalignment-with-activity' into 'master'Annabel Dunstone Gray2017-06-141-1/+0
|\ \ \ \ \
| * | | | | Fix fenced code block misalignment in events/activity31263-fix-fenced-code-misalignment-with-activityEric Eastwood2017-06-131-1/+0
* | | | | | Merge branch '32470-pag-links' into 'master'Annabel Dunstone Gray2017-06-141-3/+3
|\ \ \ \ \ \
| * | | | | | more visual contrast for active page in pagination widget32470-pag-linksSimon Knox2017-06-131-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-146-12/+44
|\ \ \ \ \ \
| * | | | | | Help landing page customizationsRobin Bobbitt2017-06-146-12/+44
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-1428-35/+305
|\ \ \ \ \ \
| * | | | | | Implement diff viewersDouwe Maan2017-06-1428-35/+305
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil TrzciƄski2017-06-141-19/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |