summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport some changes from EEes_backportValery Sizov2016-01-225-80/+83
* Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-224-29/+27
|\
| * Fix MR diff 'Edit' buttonfix-mr-diff-edit-buttonDouwe Maan2016-01-214-29/+27
* | Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-223-6/+10
|\ \
| * | Properly highlight right side of parallel difffix-diff-commentsDouwe Maan2016-01-221-1/+3
| * | Restore diff commentsDouwe Maan2016-01-222-5/+7
| |/
* | Merge branch 'file_finder_doc_fixes' into 'master' Achilleas Pipinellis2016-01-221-6/+7
|\ \
| * | Fix grammar and typos in file finder docsAchilleas Pipinellis2016-01-221-6/+7
|/ /
* | Merge branch 'unescaped-diffs' into 'master' Robert Speicher2016-01-223-8/+20
|\ \
| * | FixDouwe Maan2016-01-221-2/+2
| * | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-223-8/+20
| |/
* | Merge branch 'fix_file_finder' into 'master' Achilleas Pipinellis2016-01-211-5/+8
|\ \
| * | File finder can be invoked from anywhere!Achilleas Pipinellis2016-01-221-5/+8
* | | Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-217-19/+46
|\ \ \
| * | | Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-207-19/+46
* | | | Merge branch 'diff-highlight-themes' into 'master' Robert Speicher2016-01-2121-268/+237
|\ \ \ \ | |_|/ / |/| | |
| * | | Make dark inline diffs a little more obviousdiff-highlight-themesDouwe Maan2016-01-211-2/+2
| * | | Pretty highlighted diffs for every themeDouwe Maan2016-01-215-20/+37
| * | | Use consistent markup and styling for highlighting across blobs, diffs, blame...Douwe Maan2016-01-2121-260/+212
* | | | Merge branch 'housekeeping-doc' into 'master' Achilleas Pipinellis2016-01-213-0/+23
|\ \ \ \
| * | | | Refactor housekeeping documentationAchilleas Pipinellis2016-01-212-6/+15
| * | | | Merge branch 'master' into housekeeping-docAchilleas Pipinellis2016-01-21535-2472/+9542
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'file_finder' into 'master' Achilleas Pipinellis2016-01-214-0/+43
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add file finder documentationAchilleas Pipinellis2016-01-214-0/+43
|/ / / /
* | | | Merge branch 'drag-drop-cursor' into 'master' Jacob Schatz2016-01-211-0/+11
|\ \ \ \
| * | | | Milestone drag & drop cursorPhil Hughes2016-01-211-0/+11
* | | | | Merge branch 'ci/build-artifacts-documentation' into 'master' Achilleas Pipinellis2016-01-215-0/+175
|\ \ \ \ \
| * | | | | Refactor build artifacts documentationci/build-artifacts-documentationAchilleas Pipinellis2016-01-216-52/+175
| * | | | | Add basic documentation for build artifactsGrzegorz Bizon2016-01-203-0/+52
* | | | | | Merge branch 'doc_restart_gitlab' into 'master' Achilleas Pipinellis2016-01-213-0/+164
|\ \ \ \ \ \
| * | | | | | Fix typos, make things more clearAchilleas Pipinellis2016-01-211-18/+25
| * | | | | | Link to restart_gitlab.md and some more fixesdoc_restart_gitlabAchilleas Pipinellis2016-01-201-3/+10
| * | | | | | Add document on restarting GitLabAchilleas Pipinellis2016-01-203-0/+150
| |/ / / / /
* | | | | | Merge branch 'fix/artifacts-download-progress-bar' into 'master' Grzegorz Bizon2016-01-213-10/+17
|\ \ \ \ \ \
| * | | | | | Move build artifacts javascripts into separate filefix/artifacts-download-progress-barGrzegorz Bizon2016-01-213-13/+16
| * | | | | | Do not use progress bar when downloading build artifactsGrzegorz Bizon2016-01-211-1/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-permissions' into 'master' Robert Speicher2016-01-2126-0/+0
|\ \ \ \ \ \
| * | | | | | remove execution permissions from fontsPirate Praveen2016-01-2125-0/+0
| * | | | | | add execution permission for scriptPirate Praveen2016-01-211-0/+0
| |/ / / / /
* | | | | | Merge branch 'workhorse-path' into 'master' Robert Speicher2016-01-214-9/+12
|\ \ \ \ \ \
| * | | | | | Use gitlab-workhorse 0.6.1workhorse-pathJacob Vosmaer2016-01-212-2/+2
| * | | | | | Mention init script updateJacob Vosmaer2016-01-211-4/+1
| * | | | | | Init script changes for gitlab-workhorse in 8.4Jacob Vosmaer2016-01-212-3/+9
* | | | | | | Merge branch 'fix-github-wiki-import' into 'master' Douwe Maan2016-01-211-2/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix import of GitHub's wiki when the repository has not been createdDouglas Barbosa Alexandre2016-01-211-2/+6
|/ / / / / /
* | | | | | Merge branch 'instrument-gitlab-git-repository' into 'master' Douwe Maan2016-01-211-0/+1
|\ \ \ \ \ \
| * | | | | | Instrument Gitlab::Git::RepositoryYorick Peterse2016-01-211-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-214-8/+86
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added cache:key to .gitlab-ci.yml allowing to fine tune the cachingci/cache-keyKamil Trzcinski2016-01-204-8/+86
* | | | | | Merge branch 'new-pagination' into 'master' Jacob Schatz2016-01-219-53/+32
|\ \ \ \ \ \