summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOG.mdsh-bump-hashie-to-3.5.5Stan Hu2017-02-251-1/+1
* Bump omniauth to 1.4.2Stan Hu2017-02-252-3/+3
* Bump Hashie to 3.5.5 to eliminate warning noiseStan Hu2017-02-252-1/+5
* Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-254-51/+123
|\
| * Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skipRémy Coutable2017-02-232-84/+74
| * Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-234-23/+105
* | Merge branch 'patch-14' into 'master' Allison Whilden2017-02-251-17/+17
|\ \
| * | 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
|\ \ \
| * | | 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 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 listmoving-issue-with-two-list-labelsPhil Hughes2017-02-214-5/+37
* | | | | | 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-2410-0/+185
|\ \ \ \ \ \ \
| * | | | | | | Corrected indentation on the template stringuser-calloutsJose Ivan Vargas2017-02-241-10/+9
| * | | | | | | Fix failing specsAlfredo Sumaran2017-02-231-5/+9
| * | | | | | | Modified the user_callout behaviourJose Ivan Vargas2017-02-237-45/+44
| * | | | | | | Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-234-17/+12
| * | | | | | | 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
| * | | | | | | 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
| * | | | | | | 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_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-2413-63/+76
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-0913-63/+76
* | | | | | | | | Merge branch '28366-renamed-file-tooltip-contains-html' into 'master' Filipa Lacerda2017-02-242-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status