summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpackPhil Hughes2018-02-1511-7/+19
* Merge branch '35530-teleporting-emoji-fix' into 'master'Fatih Acet2018-02-151-3/+1
|\
| * Don't reset the awards block when the emoji search is clickedJared Deckard2018-02-071-3/+1
* | Merge branch '34130-null-pipes' into 'master'Fatih Acet2018-02-151-0/+1
|\ \
| * | Prevent MR Widget error when no CI configured34130-null-pipesSimon Knox2018-02-121-0/+1
* | | Merge branch 'fl-mr-widget-4' into 'master'Tim Zallmann2018-02-145-39/+51
|\ \ \
| * | | Moves mr widget components into vue filesfl-mr-widget-4Filipa Lacerda2018-02-135-39/+51
* | | | Merge branch 'remove-unused-code-profile' into 'master'Jacob Schatz2018-02-131-18/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused coderemove-unused-code-profileClement Ho2018-02-081-18/+0
* | | | Merge branch '43198-fix-settings-panel-expanding-when-fragment-hash-linked' i...Phil Hughes2018-02-131-1/+1
|\ \ \ \
| * | | | Fix settings panel not expanding when fragment hash linkedEric Eastwood2018-02-131-1/+1
* | | | | Make Edit link style consistent on Sidebar42580-fix-lock-mr-hover-on-editAndré Luís2018-02-131-1/+1
* | | | | Merge branch '42923-close-issue' into 'master'Phil Hughes2018-02-139-49/+140
|\ \ \ \ \
| * \ \ \ \ [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-1315-141/+125
| |\ \ \ \ \
| * | | | | | Reuse getter42923-close-issueFilipa Lacerda2018-02-124-20/+35
| * | | | | | [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-126-117/+86
| |\ \ \ \ \ \
| * | | | | | | Put back class names used in shared testFilipa Lacerda2018-02-121-0/+2
| * | | | | | | Makes close/reopen issue request to inside the vue appFilipa Lacerda2018-02-098-40/+114
* | | | | | | | Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes2018-02-133-7/+9
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-styleWinnie Hellmann2018-02-123-7/+9
* | | | | | | | Merge branch 'jivl-update-katex' into 'master'Clement Ho2018-02-121-35/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Addressed mr observationsjivl-update-katexJose Ivan Vargas2018-02-121-8/+5
| * | | | | | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-1279-534/+1713
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-05505-8921/+12730
| |\ \ \ \ \ \ \ \
| * | | | | | | | | removed unused importsJose Ivan Vargas2017-12-211-2/+0
| * | | | | | | | | Removed the remains of katex from vendor assets and load everything via webpackJose Ivan Vargas2017-12-211-8/+6
| * | | | | | | | | added katex.js and load it via webpackJose Ivan Vargas2017-12-211-14/+8
* | | | | | | | | | Clean new Flash() and stop disabling no-new (eslint) when possibleAndré Luís2018-02-123-7/+6
* | | | | | | | | | Merge branch 'jivl-fix-missing-js-selector-realtime-pipeline' into 'master'Filipa Lacerda2018-02-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed missing js selector for the realtime pipelines commit compjivl-fix-missing-js-selector-realtime-pipelineJose Ivan Vargas2018-02-121-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'groups-select-axios' into 'master'Filipa Lacerda2018-02-121-11/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Convert groups_select ajax to use axiosgroups-select-axiosPhil Hughes2018-02-091-11/+11
* | | | | | | | | | Merge branch 'diff-and-gpg-badges-ajax-refactor' into 'master'Phil Hughes2018-02-122-7/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed bug with param configdiff-and-gpg-badges-ajax-refactorConstance Okoghenun2018-02-121-1/+1
| * | | | | | | | | | changed params passed to from a string to an objectConstance Okoghenun2018-02-121-2/+3
| * | | | | | | | | | Fixed typo, updated test, and removed commented codeConstance Okoghenun2018-02-082-2/+1
| * | | | | | | | | | Replaced use of $.get with axios.get and updated testsConstance Okoghenun2018-02-082-7/+17
* | | | | | | | | | | Merge branch 'refactor/move-issuable-time-tracker-vue-component' into 'master'Filipa Lacerda2018-02-122-74/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move IssuableTimeTracker vue componentGeorge Tsiolis2018-02-122-74/+79
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '42928-default-protected-variables-to-off' into 'master'Filipa Lacerda2018-02-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Default CI variables to unprotected42928-default-protected-variables-to-offEric Eastwood2018-02-091-1/+1
* | | | | | | | | | | | Merge branch 'npm-waitforimages' into 'master'Tim Zallmann2018-02-124-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update jquery.waitforimages & use npm versionnpm-waitforimagesPhil Hughes2018-02-084-5/+1
* | | | | | | | | | | | Merge branch '42922-environment-name' into 'master'Phil Hughes2018-02-121-11/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Adds tooltip for environment name42922-environment-nameFilipa Lacerda2018-02-091-11/+20
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'winh-remove-confirmation_input' into 'master'Clement Ho2018-02-091-62/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove confirmation_inputWinnie Hellmann2018-02-091-62/+0
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-02-091-0/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fl-mr-widget-missing-branch' into 'master'Phil Hughes2018-02-093-44/+63
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Remove not needed default statementFilipa Lacerda2018-02-091-1/+0