summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Align last column buttons with new environment button28753-align-buttons-environmentsFilipa Lacerda2017-02-272-26/+28
* Merge branch 'sh-bump-hashie-to-3.5.5' into 'master' Rémy Coutable2017-02-273-4/+8
|\
| * 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 'add-quotes-to-coverage-pattern' into 'master' improve-backoff-algoGrzegorz Bizon2017-02-271-1/+1
|\ \
| * | Add quotes to coverage patternMax Raab2017-02-271-1/+1
|/ /
* | 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 'update-vue-2.1' into 'master' Fatih Acet2017-02-264-5/+9
|\ \ \
| * | | add CHANGELOG.md entry for !9386update-vue-2.1Mike Greiling2017-02-201-0/+4
| * | | use CommonJS vue distributionMike Greiling2017-02-201-1/+1
| * | | upgrade Vue from v2.0.3 to v2.1.10Mike Greiling2017-02-202-7/+7
* | | | Merge branch 'pedro-mattermost-slack-notifications-text' into 'master' Kamil Trzciński2017-02-266-23/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'pedro-mattermost-slack-notifications-text' of gitlab.com:gitlab...pedro-mattermost-slack-notifications-textPedro Moreira da Silva2017-02-240-0/+0
| |\ \ \
| | * | | Update docs on Mattermost and Slack notifications channelsPedro Moreira da Silva2017-02-104-9/+12
| | * | | Add clearer placeholders and channel definition.Pedro Moreira da Silva2017-02-102-14/+14
| * | | | Update docs on Mattermost and Slack notifications channelsPedro Moreira da Silva2017-02-244-9/+12
| * | | | Add clearer placeholders and channel definition.Pedro Moreira da Silva2017-02-242-14/+14
* | | | | 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