summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-11166-1056/+3162
|\
| * Merge branch 'remove-pinto-from-flash' into 'master' Jacob Schatz2016-07-117-21/+46
| |\
| | * Remove `pinTo` from `Flash` and make inline flash messages look nicer (!4854)winniehell2016-06-307-21/+46
| * | Normalize spacing for version numbers in CHANGELOGRobert Speicher2016-07-111-3/+3
| * | Merge branch 'cleanup-coffeescripts-from-gitlab-ci' into 'master' Jacob Schatz2016-07-115-20/+4
| |\ \
| | * | Rename CiBuild as BuildTakuya Noguchi2016-07-072-4/+4
| | * | Clean up coffeescript files imported from GitLab CITakuya Noguchi2016-07-074-16/+0
| * | | Merge branch 'fix/import-event-error' into 'master' Robert Speicher2016-07-114-2/+41
| |\ \ \
| | * | | fix changelog...fix/import-event-errorJames Lopez2016-07-111-5/+3
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-even...James Lopez2016-07-11613-4819/+13622
| | |\ \ \
| | * | | | squashed - refactor to cope with sub sub N relations probably using the sub_r...James Lopez2016-07-114-2/+63
| * | | | | Merge branch 'mr-close-btn' into 'master' Robert Speicher2016-07-112-4/+8
| |\ \ \ \ \
| | * | | | | Moved merge request button visibility out of issue_helpermr-close-btnPhil Hughes2016-07-113-5/+9
| | * | | | | Correctly shows close button on merge requestsPhil Hughes2016-07-041-1/+1
| * | | | | | Merge branch 'fix-sent-notification-position' into 'master' Rémy Coutable2016-07-112-0/+37
| |\ \ \ \ \ \
| | * | | | | | Allow SentNotification#position to be set as string or hashDouwe Maan2016-07-112-0/+37
| * | | | | | | Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-1133-486/+1100
| |\ \ \ \ \ \ \
| | * | | | | | | Handle more than two paths in MergeRequest#diffsSean McGivern2016-07-112-4/+5
| | * | | | | | | Fix feature specs on CIsingle-file-diffsSean McGivern2016-07-112-22/+21
| | * | | | | | | Merge branch 'master' into single-file-diffsSean McGivern2016-07-1169-388/+1123
| | |\ \ \ \ \ \ \
| | * | | | | | | | Support renames in diff_for_path actionsSean McGivern2016-07-1110-51/+89
| | * | | | | | | | Tidy up spec action namesSean McGivern2016-07-083-14/+14
| | * | | | | | | | Memoize diffs with path options set separatelySean McGivern2016-07-081-1/+2
| | * | | | | | | | review changesLuke "Jared" Bennett2016-07-085-11/+9
| | * | | | | | | | Make expand_all param more explicitSean McGivern2016-07-084-6/+6
| | * | | | | | | | DRY up diff_for_path actionsSean McGivern2016-07-085-98/+84
| | * | | | | | | | Remove unused argument to CompareService#executeSean McGivern2016-07-082-5/+11
| | * | | | | | | | Fix comments on collapsed and expanded diffsSean McGivern2016-07-081-26/+23
| | * | | | | | | | Allow expanding all diffs at onceSean McGivern2016-07-084-1/+45
| | * | | | | | | | Ensure only renderable text diffs are collapsedSean McGivern2016-07-088-10/+166
| | * | | | | | | | Added frontend collapsible behaviorLuke "Jared" Bennett2016-07-083-0/+55
| | * | | | | | | | Disable overflow messagesSean McGivern2016-07-086-58/+3
| | * | | | | | | | Collapse large diffs by defaultSean McGivern2016-07-0817-374/+762
| * | | | | | | | | Merge branch 'remove-duplicate-api-field' into 'master' Rémy Coutable2016-07-112-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | entities: remove :description from MergeRequestBen Boeckel2016-07-112-1/+1
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master' Douwe Maan2016-07-114-7/+30
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Just remove the prefix, feedback:send-entry-via-Gitlab-Workhorse-Send-DataLin Jen-Shin2016-07-111-1/+2
| | * | | | | | | | Just give regular 404, feedback:Lin Jen-Shin2016-07-111-1/+1
| | * | | | | | | | Fix one of the failing tests. Test against the headersLin Jen-Shin2016-07-061-4/+9
| | * | | | | | | | Use Gitlab-Workhorse-Send-Data to send entry:Lin Jen-Shin2016-07-053-2/+19
| * | | | | | | | | Merge branch 'remove-not-released-status' into 'master' Robert Speicher2016-07-111-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove not released statusMax Raab2016-06-301-1/+1
| * | | | | | | | | | Merge branch 'dz-sidebar-shadow' into 'master' Dmitriy Zaporozhets2016-07-111-0/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Refactor box-shadow style for sidebar to satisfy css lintdz-sidebar-shadowDmitriy Zaporozhets2016-07-111-1/+1
| | * | | | | | | | | | Add side shadow for unpinned sidebarDmitriy Zaporozhets2016-07-091-0/+7
| * | | | | | | | | | | Merge branch 'dz-today-issue-color' into 'master' Dmitriy Zaporozhets2016-07-111-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Lower case todya issue colorsdz-today-issue-colorDmitriy Zaporozhets2016-07-111-2/+2
| | * | | | | | | | | | Make color that highligh today issues more lightweightDmitriy Zaporozhets2016-07-091-2/+2
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'fix-type-in-project-factory' into 'master' Rémy Coutable2016-07-111-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix typo in factory for projects.rbYatish Mehta2016-07-051-1/+1