summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cache column_exists? for application settingssh-cache-column-existsStan Hu2018-03-154-3/+23
* Merge branch 'allow-ee-in-backtraces' into 'master'Robert Speicher2018-03-123-8/+6
|\
| * Include the ee/ directory in backtracesallow-ee-in-backtracesSean McGivern2018-03-123-8/+6
* | Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into 'm...Clement Ho2018-03-125-48/+56
|\ \
| * | Move NothingToMerge vue componentGeorge Tsiolis2018-03-085-48/+56
* | | Merge branch 'removes-source-branch-widget-state' into 'master'Filipa Lacerda2018-03-124-1/+41
|\ \ \
| * | | fixed specPhil Hughes2018-03-121-0/+1
| * | | Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-statePhil Hughes2018-03-124-1/+40
* | | | Merge branch 'fix-duplicate-notes' into 'master'Filipa Lacerda2018-03-127-17/+94
|\ \ \ \
| * | | | fixed note polling not sending updated last fetched at datefix-duplicate-notesPhil Hughes2018-03-124-7/+71
| * | | | added mutation specPhil Hughes2018-03-102-8/+21
| * | | | fix polling not working correctlyPhil Hughes2018-03-091-1/+1
| * | | | Fixed issue notes being duplicatedPhil Hughes2018-03-093-4/+4
* | | | | Merge branch '42579-fix-sidebar-dropdown-hover-style' into 'master'Phil Hughes2018-03-122-13/+32
|\ \ \ \ \
| * | | | | Resolve "Hover style for sidebar dropdowns is wrong"Lukas Eipert2018-03-122-13/+32
|/ / / / /
* | | | | Merge branch 'tc-api-fix-expose_url' into 'master'Stan Hu2018-03-123-1/+47
|\ \ \ \ \
| * | | | | Respect the protocol in `expose_url`Toon Claes2018-03-123-1/+47
|/ / / / /
* | | | | Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-125-34/+65
|\ \ \ \ \
| * | | | | Remove unused Compare#base_commitosw-stop-recalculating-merge-base-on-mr-loadingOswaldo Ferreira2018-03-082-36/+19
| * | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-075-19/+67
* | | | | | Merge branch 'add-indexes-to-todos-for-heavy-users-like-sean' into 'master'Yorick Peterse2018-03-123-1/+36
|\ \ \ \ \ \
| * | | | | | Add partial indexes on todos to handle users with many todosadd-indexes-to-todos-for-heavy-users-like-seanGreg Stark2018-03-093-1/+36
* | | | | | | Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-123-4/+21
|\ \ \ \ \ \ \
| * | | | | | | Fix code and wiki search results when filename is non-ASCIISean McGivern2018-03-123-4/+21
* | | | | | | | Merge branch 'fl-document-key-vue' into 'master'Tim Zallmann2018-03-121-0/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up docsfl-document-key-vueFilipa Lacerda2018-03-011-8/+0
| * | | | | | | | Merge branch 'master' into fl-document-key-vueFilipa Lacerda2018-03-0164-141/+431
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Adds information about nested v-forFilipa Lacerda2018-02-281-0/+18
| * | | | | | | | | Merge branch 'master' into fl-document-key-vueFilipa Lacerda2018-02-28169-829/+2617
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typosFilipa Lacerda2018-02-271-5/+11
| * | | | | | | | | | Adds guidelines regarding `:key` keywordFilipa Lacerda2018-02-271-0/+35
* | | | | | | | | | | Merge branch 'docs-vue-components' into 'master'Phil Hughes2018-03-121-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updates file extensions on Vue docsFilipa Lacerda2018-03-121-6/+6
* | | | | | | | | | | | Merge branch '44139-fix-issue-boards-dup-keys' into 'master'Phil Hughes2018-03-122-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add changelog entryKushal Pandya2018-03-121-0/+6
| * | | | | | | | | | | | Use `list.id` for `:key`Kushal Pandya2018-03-121-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch '44096-update-zaproxy-image-in-auto-devops-template' into 'master'Dmitriy Zaporozhets2018-03-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use GitLab fork of zaproxyFabien Catteau2018-03-121-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-124-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwpsEric Eastwood2018-03-084-14/+20
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'remove-jquery-globals' into 'master'Phil Hughes2018-03-12289-20/+386
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-09289-20/+386
* | | | | | | | | | | | Merge branch '43702-update-label-dropdown-wording' into 'master'Phil Hughes2018-03-1217-24/+244
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add changelog entry43702-update-label-dropdown-wordingKushal Pandya2018-03-121-0/+5
| * | | | | | | | | | | Update test for change in label dropdown action nameKushal Pandya2018-03-125-11/+11
| * | | | | | | | | | | Add `createLabelTitle` & `manageLabelsTitle` props for action stringKushal Pandya2018-03-122-5/+43
| * | | | | | | | | | | Add `headerTitle` prop for container header stringKushal Pandya2018-03-122-4/+23
| * | | | | | | | | | | Add `isProject` and computed props to for contextual info for dropdownKushal Pandya2018-03-122-0/+50
| * | | | | | | | | | | Add `isProject` mock configKushal Pandya2018-03-121-0/+1
| * | | | | | | | | | | Use label dropdown helper for rendering contextual stringKushal Pandya2018-03-122-4/+6