Commit Graph

2475 Commits

Author SHA1 Message Date
Clement Ho 673b0461b0 [skip ci] .help-block to .form-text.text-muted 2018-04-11 13:26:37 -05:00
Clement Ho b0d790efb9 [skip ci] Add nav converted classes 2018-04-10 15:06:49 -05:00
Clement Ho 65c07bdbf0 [skip ci] Convert img-responsive to img-fluid 2018-04-10 13:16:26 -05:00
Clement Ho 46031d63cd [skip ci] Convert panel related class names to card 2018-04-10 12:11:34 -05:00
Clement Ho 9bcf8f43c6 [skip ci] Replace hidden-xs 2018-04-09 16:50:40 -05:00
Clement Ho b413785e1d [skip ci] Replace .pull-right with .float-right 2018-04-09 12:42:45 -05:00
Phil Hughes 9e13ca6a3a Merge branch '44296-commit-path' into 'master'
Resolve "Cannot read property 'commit_path' of null"

Closes #44296

See merge request gitlab-org/gitlab-ce!18231
2018-04-09 15:27:09 +00:00
Filipa Lacerda 52440755df Merge branch 'move-board-blank-state-vue-component' into 'master'
Move BoardBlankState vue component

See merge request gitlab-org/gitlab-ce!17666
2018-04-09 10:08:05 +00:00
Phil Hughes feb149f864 Merge branch '44224-remove-gl' into 'master'
Remove modal boards code from global namepsace

See merge request gitlab-org/gitlab-ce!18222
2018-04-09 07:58:41 +00:00
Francisco Javier López 31dd86b636 Projects and groups badges settings UI 2018-04-08 10:20:05 +00:00
George Tsiolis 7009ec6562 Move BoardBlankState vue component 2018-04-07 03:04:35 +03:00
Jose Ivan Vargas d303b5ba1f Added specs for rendered output, changed the background for stable tracks 2018-04-06 14:51:57 -05:00
Jose Ivan Vargas 89c8bd4eca Added specs 2018-04-06 14:39:47 -05:00
Jose Ivan Vargas 146954d0bb UX Adjustments for the prometheus dashboard 2018-04-06 14:37:46 -05:00
Jose Ivan Vargas f4ff62fa64 formatting fixes 2018-04-06 14:37:46 -05:00
Jose Ivan Vargas 657fea8688 Add summary statistics prometheus dashboard 2018-04-06 14:37:46 -05:00
Tim Zallmann b2daa846a1 Web IDE blob image + default fallback 2018-04-06 17:49:06 +00:00
Filipa Lacerda ab61eca716
Checks if commit information exists before trying to render it 2018-04-06 17:50:19 +01:00
Filipa Lacerda 377c8c7846 Stop redirecting the page in graph main actions 2018-04-06 15:42:19 +00:00
Sean McGivern e5d32c2c0c Merge branch '43246-checkfilter' into 'master'
Resolve "Show a message when loading the issues / merge requests dashboard without filters"

Closes #43246

See merge request gitlab-org/gitlab-ce!17961
2018-04-06 13:25:18 +00:00
Filipa Lacerda eb71b5da81
Remove modal store and mixins from global scope 2018-04-06 13:12:21 +01:00
Fatih Acet 52b232ca5d Merge branch '44939-epic-comment-thread-backports' into 'master'
Resolve "Follow-up from "Refactor discussions/notes code""

Closes #44939

See merge request gitlab-org/gitlab-ce!18190
2018-04-06 10:09:01 +00:00
Shah El-Rahman 43ef375e08 Add confirmation modal to "Change username" 2018-04-06 09:36:22 +00:00
Sean McGivern ca330f7ea3 Merge branch 'issue_44270' into 'master'
Show issues of subgroups in group-level issue board

Closes #44270

See merge request gitlab-org/gitlab-ce!18187
2018-04-06 09:20:01 +00:00
Kushal Pandya 7544a555aa Add noteableType to mock data object 2018-04-06 14:26:40 +05:30
Mayra Cabrera d54cf868f8 Resolve "Show `failure_reason` and upgrade tooltips of jobs" 2018-04-05 21:04:42 +00:00
Felipe Artur 7c6f4adac9 Fix more specs 2018-04-05 14:58:49 -03:00
Felipe Artur 62574be35d Fix specs 2018-04-05 14:58:49 -03:00
Filipa Lacerda 0c60e781c0 Merge branch 'ide-diff-inline' into 'master'
Change IDE diff view responsively

Closes #44305

See merge request gitlab-org/gitlab-ce!18049
2018-04-05 15:23:00 +00:00
Tim Zallmann c88cc0c0ec Web IDE markdown preview 2018-04-05 11:12:40 +00:00
Phil Hughes 891164f10b
set `renderSideBySide` when creating diff instance 2018-04-05 10:24:18 +01:00
Phil Hughes bc64e20cab
updated wordWrap option be `on` 2018-04-05 10:19:16 +01:00
Phil Hughes f1ddfac4b0
added specs 2018-04-05 10:19:15 +01:00
Winnie Hellmann 0296871112 Use template strings in search_autocomplete_spec.js 2018-04-05 10:37:57 +02:00
Jan Provaznik d10416e231 Fixed dashboard filtering tests 2018-04-03 20:19:20 +02:00
Phil Hughes c0dddb511c
Merge branch 'master' into ide-pending-tab 2018-04-03 10:59:29 +01:00
Dennis Tang 91a4eb1cb1 Resolve "Clicking confidential and lock icons on sidebar should also activate dropdown" 2018-04-02 18:46:50 +00:00
Clement Ho 6b5ec93ad9 Merge branch 'fl-prettier-mock-data' into 'master'
Prettify mock data files

See merge request gitlab-org/gitlab-ce!18091
2018-04-02 14:49:26 +00:00
Phil Hughes 6b89ab1161 Merge branch 'tz-ide-open-mr' into 'master'
Basic Setup for MR Showing

Closes #44840 and #44839

See merge request gitlab-org/gitlab-ce!17952
2018-04-01 15:24:15 +00:00
Filipa Lacerda 3e6e2ef60d
Removes eslint disabled comments 2018-03-29 18:56:19 +01:00
Tim Zallmann 705e174b20 Merge branch 'vuex-action-helper-correctly-fail' into 'master'
Correctly fail Vuex action helper

Closes #44735

See merge request gitlab-org/gitlab-ce!18072
2018-03-29 14:19:37 +00:00
Phil Hughes 1d5262f9ef Merge branch 'escape-autocomplete-values-for-markdown' into 'master'
Escape autocomplete results for Markdown

See merge request gitlab-org/gitlab-ce!18051
2018-03-29 13:32:08 +00:00
Sean McGivern 78aa8c162e Escape autocomplete results for Markdown
A label name can contain a `_`, `~~`, or other Markdown-significant
characters. But label references are processed _after_ Markdown processing has
run, so we can't easily fix this on the backend.

We can make it more convenient, though, by changing the frontend to escape these
characters so they aren't processed as Markdown, when we insert them from
autocomplete.
2018-03-29 13:27:08 +01:00
Kamil Trzciński 8b37ce6f7f Merge branch 'add-per-runner-job-timeout' into 'master'
Add per runner job timeout

Closes #43426

See merge request gitlab-org/gitlab-ce!17221
2018-03-29 10:54:06 +00:00
Filipa Lacerda 470b8ca10a
Add dispatch mock to the test helper 2018-03-29 11:14:18 +01:00
Phil Hughes e26d20311c
fixed failinng tests after helper change 2018-03-29 10:44:38 +01:00
Sean McGivern f39beff64c Merge branch 'jivl-change-copy-text-promote-milestones-labels' into 'master'
Fix promoting labels and milestones copy text

Closes #44208

See merge request gitlab-org/gitlab-ce!17726
2018-03-29 09:44:25 +00:00
Filipa Lacerda 7fa7f3e326
Use `toEqual` for the matchers 2018-03-29 10:33:44 +01:00
Phil Hughes 6f0b16e312
Correctly fail Vuex action helper 2018-03-29 09:37:01 +01:00
Fatih Acet 0aae4251a0 Merge branch '44717-no-resolve-issue' into 'master'
Resolve "There should not be a jump discussion button on issues"

Closes #44717

See merge request gitlab-org/gitlab-ce!18034
2018-03-28 21:37:43 +00:00