summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-related-issues-board-issue-count-badge-styles' into 'm...Filipa Lacerda2017-06-144-28/+37
|\
| * Backport issue count badge style refactor for re-usebackport-related-issues-board-issue-count-badge-stylesEric Eastwood2017-06-134-28/+37
* | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1413-19/+19
|\ \
| * | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-133-6/+5
| * | Rename BuildEntity to JobEntityKamil Trzcinski2017-06-135-7/+7
| * | Fix support for external_url for commit statusesKamil Trzcinski2017-06-131-1/+1
| * | Allow to access pipelines even if they are disabled, but only present jobs an...Kamil Trzcinski2017-06-137-7/+8
* | | Merge branch 'bpj-small-pipeline-ui-changes' into 'master'Annabel Dunstone Gray2017-06-132-2/+2
|\ \ \
| * | | Make small pipeline schedules UI enhancements.bpj-small-pipeline-ui-changesBryce Johnson2017-06-132-2/+2
* | | | Merge branch '33628-pipeline-sidebar' into 'master'Phil Hughes2017-06-131-0/+1
|\ \ \ \
| * | | | Adds "Pipeline" to job's sidebar33628-pipeline-sidebarFilipa Lacerda2017-06-131-0/+1
* | | | | Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-131-14/+2
|\ \ \ \ \
| * | | | | Remove js classes from vue component that are not needed in vue component33642-timeago-updateFilipa Lacerda2017-06-131-14/+2
| |/ / / /
* | | | | Merge branch 'wiki-limited-width' into 'master'Annabel Dunstone Gray2017-06-1310-152/+149
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Limit wiki container widthwiki-limited-widthPhil Hughes2017-06-1310-152/+149
| | |/ / | |/| |
* | | | Merge branch '33629-scroll-color' into 'master'Phil Hughes2017-06-131-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change border color of job's scroll controllers to $border-colorFilipa Lacerda2017-06-131-1/+1
| | |/ | |/|
* | | Merge branch 'tidy-up-issues-controller-filters' into 'master'Douwe Maan2017-06-131-9/+6
|\ \ \
| * | | Always check read_issue permissions when loading issuetidy-up-issues-controller-filtersSean McGivern2017-06-131-9/+6
* | | | Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-131-5/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposureGrzegorz Bizon2017-06-131-5/+2
| | |/ | |/|
* | | Merge branch 'zj-commit-status-sortable-name' into 'master'Grzegorz Bizon2017-06-131-2/+2
|\ \ \
| * | | Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-131-2/+2
* | | | Center dropdown for pipeline's mini graphFilipa Lacerda2017-06-131-1/+10
* | | | Merge branch 'fix/33584-atom-layout' into 'master'Rémy Coutable2017-06-1316-79/+59
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor atom builder by using xml.atom layoutTieu-Philippe KHIM2017-06-1216-79/+59
* | | | Fix filename method of GitlabUploader to return always real filenamefix-filename-of-artifact-uploaderKamil Trzcinski2017-06-131-0/+4
| |/ / |/| |
* | | Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-123-12/+23
|\ \ \
| * | | Set artifact working directory to be in the destination store to prevent unne...sh-fix-refactor-uploader-work-dirStan Hu2017-06-063-12/+23
* | | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-1210-1/+76
|\ \ \ \
| * | | | DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file29010-perf-barRémy Coutable2017-06-093-26/+19
| * | | | Fix peek-rblineprof JSRémy Coutable2017-06-091-1/+1
| * | | | Ensure peek-performance_bar doesn't break existing functionalitiesRémy Coutable2017-06-091-0/+14
| * | | | Fix linting, route, and specsRémy Coutable2017-06-093-7/+7
| * | | | Improve the JS for the `p b` shortcut and fix its CSSRémy Coutable2017-06-091-3/+4
| * | | | Add `p b` to the shortcuts documentationRémy Coutable2017-06-091-1/+1
| * | | | Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-092-18/+14
| * | | | Small adjustmentsRémy Coutable2017-06-091-0/+2
| * | | | Improve UI of the performance barRémy Coutable2017-06-092-10/+10
| * | | | Fix replacement of Pygments with RougeRémy Coutable2017-06-091-2/+6
| * | | | Replace Tipsy by Bootstrap's tooltipsRémy Coutable2017-06-091-1/+0
| * | | | Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-091-0/+1
| * | | | Tweak Peek to display SQL queriesRémy Coutable2017-06-092-0/+27
| * | | | New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-096-1/+39
* | | | | Merge branch '32834-task-note-only' into 'master'Sean McGivern2017-06-121-5/+7
|\ \ \ \ \
| * | | | | Only add a description change note when no tasks are updatedJared Deckard2017-06-121-5/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'background-migrations' into 'master'30404-high-cpu-usage-on-mrs-with-large-diffsRémy Coutable2017-06-121-0/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add the ability to perform background migrationsYorick Peterse2017-06-121-0/+23
* | | | | Merge branch 'fix/import-commit-status-issue' into 'master'Douwe Maan2017-06-121-1/+1
|\ \ \ \ \
| * | | | | ignore name validation on importingfix/import-commit-status-issueJames Lopez2017-06-121-1/+1