summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-248-3/+155
| | | | | | MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9250/ See https://gitlab.com/madlittlemods/gl-mock-ci-service
* Merge branch 'patch-14' into 'master' Allison Whilden2017-02-251-17/+17
|\ | | | | | | | | Update users.md See merge request !9475
| * Update users.mdSarah O'Donnell2017-02-231-17/+17
| |
* | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-2428-787/+497
|\ \ | | | | | | | | | | | | Consistently create, update, and delete files, taking CRLF settings into account See merge request !9207
| * | Fix specdm-fix-web-edit-new-linesDouwe Maan2017-02-244-82/+26
| | |
| * | Add newlineDouwe Maan2017-02-241-0/+1
| | |
| * | We don't need these checks anymoreDouwe Maan2017-02-241-19/+0
| | |
| * | Raise error when no content is providedDouwe Maan2017-02-244-9/+23
| | |
| * | Address reviewDouwe Maan2017-02-245-25/+41
| | |
| * | Update API v3 in line with v4Douwe Maan2017-02-241-7/+0
| | |
| * | Fix new offensesDouwe Maan2017-02-241-3/+1
| | |
| * | Fix specDouwe Maan2017-02-241-2/+2
| | |
| * | Fix specsDouwe Maan2017-02-242-3/+2
| | |
| * | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-2416-102/+86
| | |
| * | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-2412-596/+376
| | |
* | | Merge branch '28419-ask-confirmation-cancel' into 'master' Fatih Acet2017-02-241-1/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds confirmation for cancel button Closes #28419 See merge request !9519
| * | | 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-244-5/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes label from previous list Closes #28484 See merge request !9418
| * | | | Removes label from previous listmoving-issue-with-two-list-labelsPhil Hughes2017-02-214-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 Sumaran2017-02-241-11/+170
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from application.js See merge request !9491
| * | | | | 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-2410-0/+185
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added user-callouts Closes #27269 See merge request !9249
| * | | | | | Corrected indentation on the template stringuser-calloutsJose Ivan Vargas2017-02-241-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed eslint disabled rules
| * | | | | | Fix failing specsAlfredo Sumaran2017-02-231-5/+9
| | | | | | |
| * | | | | | Modified the user_callout behaviourJose Ivan Vargas2017-02-237-45/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it appends a template instead of relying in a partial to show it.
| * | | | | | Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-234-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 buttonJose Ivan Vargas2017-02-235-7/+7
| | | | | | |
| * | | | | | Changed the javascript class from using the global scope to exporting it via ↵Jose Ivan Vargas2017-02-239-78/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webpack Also improved accesibility and change the id from user_callouts to a class
| * | | | | | Added CHANGELOG and corrected linter errorsJose Ivan Vargas2017-02-235-4/+7
| | | | | | |
| * | | | | | Created unit tests, fixtures and integration testsJose Ivan Vargas2017-02-2310-33/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed the user_callout haml to a partial and added the corresponding SVG icon
| * | | | | | Initial version of the user-calloutsJose Ivan Vargas2017-02-235-2/+83
| | | | | | |
* | | | | | | Merge branch 'remove-require-context-profile-bundle' into 'master' Alfredo Sumaran2017-02-241-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from profile_bundle See merge request !9492
| * | | | | | | 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_bundle See merge request !9493
| * | | | | | | | 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_bundle See merge request !9494
| * | | | | | | | 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_bundle See merge request !9496
| * | | | | | | | 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-2413-63/+76
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI highlight & autocomplete See merge request !8420
| * | | | | | | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-0913-63/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an effort to tackle #18437 this removes 2 of the jQuery UI plugins. Highlight & autocomplete, both used once in our code. Highlight was just removed easily, autocomplete was replaced with GL dropdown
* | | | | | | | Merge branch '28366-renamed-file-tooltip-contains-html' into 'master' Filipa Lacerda2017-02-242-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Renamed file tooltip contains html" Closes #28366 See merge request !9374
| * | | | | | | | Remove markup showing in tooltip for renamed files in diff view28366-renamed-file-tooltip-contains-htmlSam Rose2017-02-202-2/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'refactor-graphs-bundle' into 'master' Filipa Lacerda2017-02-248-558/+507
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor graphs bundle to ES module syntax See merge request !9502
| * | | | | | | | | 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-244-282/+274
| | | | | | | | | |
| * | | | | | | | | refactor stat_graph_contributors_util to es6 module syntaxMike Greiling2017-02-244-137/+135
| | | | | | | | | |
| * | | | | | | | | remove unused StatGraph classMike Greiling2017-02-243-39/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'boards-card-template-to-js' into 'master' Filipa Lacerda2017-02-246-74/+239
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue boards card template in JS See merge request !9477