summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bpj-small-pipeline-ui-changes' into 'master'Annabel Dunstone Gray2017-06-132-2/+2
|\ | | | | | | | | | | | | Make small pipeline schedules UI enhancements. Closes #32565 See merge request !12136
| * 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 sidebar Closes #33628 See merge request !12131
| * | 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 component Closes #33642 See merge request !12133
| * | | 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 width Closes #23734 See merge request !12089
| * | Limit wiki container widthwiki-limited-widthPhil Hughes2017-06-1310-152/+149
| | | | | | | | | | | | Closes #23734
* | | Merge branch '33629-scroll-color' into 'master'Phil Hughes2017-06-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change border color of job's scroll controllers to $border-color Closes #33629 See merge request !12129
| * | | 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 issue See merge request !12095
| * | | Always check read_issue permissions when loading issuetidy-up-issues-controller-filtersSean McGivern2017-06-131-9/+6
| | | | | | | | | | | | | | | | We never want to skip the check, so that some actions did so was a mistake.
* | | | 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 entity Closes #33605 See merge request !12124
| * | | 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 name Closes #33403 See merge request !12118
| * | | Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older pipelines can contain jobs without a name, in which case 'nameless' is used right now, so we can properly still handle other actions on these jobs. Fixes gitlab-org/gitlab-ce#33403
* | | | 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 a layout See merge request !12114
| * | | 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 unnecessary I/O Closes #33274 See merge request !11905
| * | | Set artifact working directory to be in the destination store to prevent ↵sh-fix-refactor-uploader-work-dirStan Hu2017-06-063-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary I/O Similar to #33218, build artifacts were being uploaded into a CarrierWave temporary directory in the Rails root directory before moved to their final destination, which could cause a copy across filesystems. This merge request refactors the work in !11866 so that any uploader can just override `work_dir` to change the default implementation. Closes #33274
* | | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-1210-1/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| * | | | DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file29010-perf-barRémy Coutable2017-06-093-26/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Fix peek-rblineprof JSRémy Coutable2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Ensure peek-performance_bar doesn't break existing functionalitiesRémy Coutable2017-06-091-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Fix linting, route, and specsRémy Coutable2017-06-093-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Improve the JS for the `p b` shortcut and fix its CSSRémy Coutable2017-06-091-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Add `p b` to the shortcuts documentationRémy Coutable2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-092-18/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Small adjustmentsRémy Coutable2017-06-091-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Improve UI of the performance barRémy Coutable2017-06-092-10/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Fix replacement of Pygments with RougeRémy Coutable2017-06-091-2/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Replace Tipsy by Bootstrap's tooltipsRémy Coutable2017-06-091-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Tweak Peek to display SQL queriesRémy Coutable2017-06-092-0/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-096-1/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '32834-task-note-only' into 'master'Sean McGivern2017-06-121-5/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Description Change Notes When Toggling Tasks Closes #32834 See merge request !12057
| * | | | | 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 migrations See merge request !11854
| * | | | Add the ability to perform background migrationsYorick Peterse2017-06-121-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background migrations can be used to perform long running data migrations without these blocking a deployment procedure. See MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11854 for more information.
* | | | | Merge branch 'fix/import-commit-status-issue' into 'master'Douwe Maan2017-06-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore commit status name validation on importing Closes #33490 See merge request !12039
| * | | | | ignore name validation on importingfix/import-commit-status-issueJames Lopez2017-06-121-1/+1
| | | | | |
* | | | | | Merge branch 'operau2f' into 'master'Rémy Coutable2017-06-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix FIDO U2F for Opera browser (based on !10118) See merge request !12082
| * | | | | | Enable FIDO U2F on Opera browser, see http://caniuse.com/#feat=u2fJakub Kramarz2017-06-111-1/+1
| | | | | | |
* | | | | | | Always render warnings icon in orangeFilipa Lacerda2017-06-121-5/+5
| |_|/ / / / |/| | | | |
* | | | | | Improve Job detail view to make it refreshed in real-time instead of reloadingFilipa Lacerda2017-06-1219-165/+642
| | | | | |
* | | | | | Merge branch 'rs-simplify-todo-count-spec' into 'master'Rémy Coutable2017-06-122-6/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test todos_count_format helper at the correct level to improve speed See merge request !12075
| * | | | | | Test todos_count_format helper at the correct level to improve speedrs-simplify-todo-count-specRobert Speicher2017-06-092-6/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Instead of an integration test that creates 101 Todo records to test a simple view helper, just unit test the helper.
* | | | | | Merge branch 'unassign-default-dropdown-state' into 'master'Phil Hughes2017-06-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes default text to "Unassigned" Closes #32802 See merge request !12081
View Lorry Controller Status