summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Align last column buttons with new environment button28753-align-buttons-environmentsFilipa Lacerda2017-02-272-26/+28
* Merge branch 'backoff-algo-backport-ee' into 'master' Jacob Schatz2017-02-261-0/+52
|\
| * Adds backoff algo from EE to CEbackoff-algo-backport-eeFilipa Lacerda2017-02-241-0/+52
* | Merge branch '28419-ask-confirmation-cancel' into 'master' Fatih Acet2017-02-241-1/+16
|\ \
| * | Adds confirmation for cancel button28419-ask-confirmation-cancelFilipa Lacerda2017-02-241-1/+16
* | | Merge branch 'moving-issue-with-two-list-labels' into 'master' Alfredo Sumaran2017-02-242-5/+12
|\ \ \
| * | | Removes label from previous listmoving-issue-with-two-list-labelsPhil Hughes2017-02-212-5/+12
* | | | Merge branch 'remove-require-context-application-bundle' into 'master' Alfredo Sumaran2017-02-241-11/+170
|\ \ \ \
| * | | | add missing require statement and don't require selfremove-require-context-application-bundleMike Greiling2017-02-231-1/+1
| * | | | remove require.context from application.jsMike Greiling2017-02-231-11/+170
* | | | | Merge branch 'user-callouts' into 'master' Filipa Lacerda2017-02-243-0/+101
|\ \ \ \ \
| * | | | | Corrected indentation on the template stringuser-calloutsJose Ivan Vargas2017-02-241-10/+9
| * | | | | Modified the user_callout behaviourJose Ivan Vargas2017-02-232-11/+35
| * | | | | Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-231-8/+7
| * | | | | Moved the dismiss-icon listener to close the callout to a buttonJose Ivan Vargas2017-02-231-2/+2
| * | | | | Changed the javascript class from using the global scope to exporting it via ...Jose Ivan Vargas2017-02-233-29/+34
| * | | | | Added CHANGELOG and corrected linter errorsJose Ivan Vargas2017-02-231-1/+0
| * | | | | Created unit tests, fixtures and integration testsJose Ivan Vargas2017-02-232-7/+29
| * | | | | Initial version of the user-calloutsJose Ivan Vargas2017-02-233-0/+53
* | | | | | Merge branch 'remove-require-context-profile-bundle' into 'master' Alfredo Sumaran2017-02-241-3/+2
|\ \ \ \ \ \
| * | | | | | remove require.context from profile_bundleremove-require-context-profile-bundleMike Greiling2017-02-231-3/+2
| |/ / / / /
* | | | | | Merge branch 'remove-require-context-protected-branches-bundle' into 'master' Alfredo Sumaran2017-02-241-3/+5
|\ \ \ \ \ \
| * | | | | | remove require.context from protected_branches_bundleremove-require-context-protected-branches-bundleMike Greiling2017-02-231-3/+5
| |/ / / / /
* | | | | | Merge branch 'remove-require-context-snippet-bundle' into 'master' Alfredo Sumaran2017-02-241-4/+0
|\ \ \ \ \ \
| * | | | | | remove require.context from snippet_bundleremove-require-context-snippet-bundleMike Greiling2017-02-231-4/+0
| |/ / / / /
* | | | | | Merge branch 'remove-require-context-users-bundle' into 'master' Alfredo Sumaran2017-02-241-3/+1
|\ \ \ \ \ \
| * | | | | | remove require.context from users_bundleremove-require-context-users-bundleMike Greiling2017-02-231-3/+1
| |/ / / / /
* | | | | | Merge branch 'remove-jquery-ui-plugins' into 'master' Jacob Schatz2017-02-246-23/+31
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-096-23/+31
* | | | | | Merge branch 'refactor-graphs-bundle' into 'master' Filipa Lacerda2017-02-245-531/+503
|\ \ \ \ \ \
| * | | | | | refactor stat_graph_contributors to es6 module syntaxrefactor-graphs-bundleMike Greiling2017-02-242-102/+100
| * | | | | | refactor stat_graph_contributors_graph to es6 module syntaxMike Greiling2017-02-243-277/+271
| * | | | | | refactor stat_graph_contributors_util to es6 module syntaxMike Greiling2017-02-243-135/+134
| * | | | | | remove unused StatGraph classMike Greiling2017-02-242-19/+0
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'boards-card-template-to-js' into 'master' Filipa Lacerda2017-02-243-63/+71
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed eslint errorsboards-card-template-to-jsPhil Hughes2017-02-231-8/+8
| * | | | | Issue boards card in JSPhil Hughes2017-02-233-63/+71
* | | | | | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-241-3/+2
|\ \ \ \ \ \
| * | | | | | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-231-3/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch '27530-fix-job-dropdown-pipeline-console-error' into 'master' Fatih Acet2017-02-241-14/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Prevent propagation of click even in job name inside dropdown.27530-fix-job-dropdown-pipeline-console-errorFilipa Lacerda2017-02-231-12/+20
| * | | | | adds mount function with prevent and removes keepGraph functionNur Rony2017-02-231-20/+16
| * | | | | fixes job dropdown action button errorNur Rony2017-02-231-6/+10
| |/ / / /
* | | | | Merge branch '28610-white-square-nav' into 'master' Filipa Lacerda2017-02-231-6/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix white square and sidebar animation28610-white-square-navAnnabel Dunstone Gray2017-02-231-6/+10
| |/ / /
* | | | Merge branch 'master' into 'master' Clement Ho2017-02-232-0/+38
|\ \ \ \
| * | | | on branch deletion show loading icon and disabled the buttonwendy04022017-02-222-0/+38
* | | | | Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-23158-976/+764
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '28495-content-shifting' into 'master' Filipa Lacerda2017-02-231-10/+6
| |\ \ \ \
| | * | | | Keep right padding the same whether sidebar is open or not28495-content-shiftingAnnabel Dunstone Gray2017-02-211-10/+6
| | | |_|/ | | |/| |