Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changes after review - adds alias for icons path | Filipa Lacerda | 2017-02-27 | 8 | -23/+24 |
| | |||||
* | Fix eslint error | Filipa Lacerda | 2017-02-25 | 1 | -1/+0 |
| | |||||
* | Remove unused test | Filipa Lacerda | 2017-02-25 | 1 | -30/+0 |
| | |||||
* | Merge branch 'master' into 'add-svg-loader' | Filipa Lacerda | 2017-02-25 | 49 | -834/+931 |
|\ | | | | | | | # Conflicts: # app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 | ||||
| * | Merge branch 'patch-14' into 'master' | Allison Whilden | 2017-02-25 | 1 | -17/+17 |
| |\ | | | | | | | | | | | | | Update users.md See merge request !9475 | ||||
| | * | Update users.md | Sarah O'Donnell | 2017-02-23 | 1 | -17/+17 |
| | | | |||||
| * | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' | Robert Speicher | 2017-02-24 | 28 | -787/+497 |
| |\ \ | | | | | | | | | | | | | | | | | Consistently create, update, and delete files, taking CRLF settings into account See merge request !9207 | ||||
| | * | | Fix specdm-fix-web-edit-new-lines | Douwe Maan | 2017-02-24 | 4 | -82/+26 |
| | | | | |||||
| | * | | Add newline | Douwe Maan | 2017-02-24 | 1 | -0/+1 |
| | | | | |||||
| | * | | We don't need these checks anymore | Douwe Maan | 2017-02-24 | 1 | -19/+0 |
| | | | | |||||
| | * | | Raise error when no content is provided | Douwe Maan | 2017-02-24 | 4 | -9/+23 |
| | | | | |||||
| | * | | Address review | Douwe Maan | 2017-02-24 | 5 | -25/+41 |
| | | | | |||||
| | * | | Update API v3 in line with v4 | Douwe Maan | 2017-02-24 | 1 | -7/+0 |
| | | | | |||||
| | * | | Fix new offenses | Douwe Maan | 2017-02-24 | 1 | -3/+1 |
| | | | | |||||
| | * | | Fix spec | Douwe Maan | 2017-02-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix specs | Douwe Maan | 2017-02-24 | 2 | -3/+2 |
| | | | | |||||
| | * | | Rename commit_file, commit_dir and remove_file and update specs | Douwe Maan | 2017-02-24 | 16 | -102/+86 |
| | | | | |||||
| | * | | Consistently create, update, and delete files, taking CRLF settings into account | Douwe Maan | 2017-02-24 | 12 | -596/+376 |
| | | | | |||||
| * | | | Merge branch '28419-ask-confirmation-cancel' into 'master' | Fatih Acet | 2017-02-24 | 1 | -1/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds confirmation for cancel button Closes #28419 See merge request !9519 | ||||
| | * | | | Adds confirmation for cancel button28419-ask-confirmation-cancel | Filipa Lacerda | 2017-02-24 | 1 | -1/+16 |
| | | | | | |||||
| * | | | | Merge branch 'moving-issue-with-two-list-labels' into 'master' | Alfredo Sumaran | 2017-02-24 | 4 | -5/+37 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes label from previous list Closes #28484 See merge request !9418 | ||||
| | * | | | | Removes label from previous listmoving-issue-with-two-list-labels | Phil Hughes | 2017-02-21 | 4 | -5/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dragging an issue to a list that it already exists in it was previously not removing the label for the list it was moving from. This changes that to make that API call. Closes #28484 | ||||
| * | | | | | Merge branch 'remove-require-context-application-bundle' into 'master' | Alfredo Sumaran | 2017-02-24 | 1 | -11/+170 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from application.js See merge request !9491 | ||||
| | * | | | | | add missing require statement and don't require selfremove-require-context-application-bundle | Mike Greiling | 2017-02-23 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | remove require.context from application.js | Mike Greiling | 2017-02-23 | 1 | -11/+170 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'user-callouts' into 'master' | Filipa Lacerda | 2017-02-24 | 10 | -0/+185 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added user-callouts Closes #27269 See merge request !9249 | ||||
| | * | | | | | | Corrected indentation on the template stringuser-callouts | Jose Ivan Vargas | 2017-02-24 | 1 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed eslint disabled rules | ||||
| | * | | | | | | Fix failing specs | Alfredo Sumaran | 2017-02-23 | 1 | -5/+9 |
| | | | | | | | | |||||
| | * | | | | | | Modified the user_callout behaviour | Jose Ivan Vargas | 2017-02-23 | 7 | -45/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it appends a template instead of relying in a partial to show it. | ||||
| | * | | | | | | Removed disabled rules from the user_callout_spec.js | Jose Ivan Vargas | 2017-02-23 | 4 | -17/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed the cookie sets to true and false values to make it consistent with the rest of the javascript. Fixed some haml and a missing new line | ||||
| | * | | | | | | Moved the dismiss-icon listener to close the callout to a button | Jose Ivan Vargas | 2017-02-23 | 5 | -7/+7 |
| | | | | | | | | |||||
| | * | | | | | | Changed the javascript class from using the global scope to exporting it via ↵ | Jose Ivan Vargas | 2017-02-23 | 9 | -78/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webpack Also improved accesibility and change the id from user_callouts to a class | ||||
| | * | | | | | | Added CHANGELOG and corrected linter errors | Jose Ivan Vargas | 2017-02-23 | 5 | -4/+7 |
| | | | | | | | | |||||
| | * | | | | | | Created unit tests, fixtures and integration tests | Jose Ivan Vargas | 2017-02-23 | 10 | -33/+142 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed the user_callout haml to a partial and added the corresponding SVG icon | ||||
| | * | | | | | | Initial version of the user-callouts | Jose Ivan Vargas | 2017-02-23 | 5 | -2/+83 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'remove-require-context-profile-bundle' into 'master' | Alfredo Sumaran | 2017-02-24 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from profile_bundle See merge request !9492 | ||||
| | * | | | | | | | remove require.context from profile_bundleremove-require-context-profile-bundle | Mike Greiling | 2017-02-23 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'remove-require-context-protected-branches-bundle' into 'master' | Alfredo Sumaran | 2017-02-24 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from protected_branches_bundle See merge request !9493 | ||||
| | * | | | | | | | | remove require.context from protected_branches_bundleremove-require-context-protected-branches-bundle | Mike Greiling | 2017-02-23 | 1 | -3/+5 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'remove-require-context-snippet-bundle' into 'master' | Alfredo Sumaran | 2017-02-24 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from snippet_bundle See merge request !9494 | ||||
| | * | | | | | | | | remove require.context from snippet_bundleremove-require-context-snippet-bundle | Mike Greiling | 2017-02-23 | 1 | -4/+0 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'remove-require-context-users-bundle' into 'master' | Alfredo Sumaran | 2017-02-24 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from users_bundle See merge request !9496 | ||||
| | * | | | | | | | | remove require.context from users_bundleremove-require-context-users-bundle | Mike Greiling | 2017-02-23 | 1 | -3/+1 |
| | |/ / / / / / / | |||||
* | | | | | | | | | Remove unneed code | Filipa Lacerda | 2017-02-25 | 1 | -13/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | remove tech debt code | Filipa Lacerda | 2017-02-25 | 8 | -77/+7 |
| | | | | | | | | | |||||
* | | | | | | | | | Load svgs in cycle analytics | Filipa Lacerda | 2017-02-25 | 9 | -21/+11 |
| | | | | | | | | | |||||
* | | | | | | | | | Use vhtml only when necessary | Filipa Lacerda | 2017-02-25 | 4 | -7/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Load SVGs into Pipelines | Filipa Lacerda | 2017-02-25 | 8 | -92/+81 |
| | | | | | | | | | |||||
* | | | | | | | | | Loads SVGs into JS for environments | Filipa Lacerda | 2017-02-24 | 7 | -60/+17 |
| | | | | | | | | | |||||
* | | | | | | | | | Adds loader to load SVG | Filipa Lacerda | 2017-02-24 | 3 | -2/+11 |
|/ / / / / / / / |