summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Fixed eslint errorsboards-card-template-to-jsPhil Hughes2017-02-232-11/+15
| * | | | Issue boards card in JSPhil Hughes2017-02-236-74/+235
* | | | | Merge branch '28367-fix-unfold-diff-line-number-copy-paste' into 'master' Jacob Schatz2017-02-242-2/+6
|\ \ \ \ \
| * | | | | fixes line number copy issue for unfolded parallel view diff28367-fix-unfold-diff-line-number-copy-pasteNur Rony2017-02-202-2/+6
* | | | | | Merge branch '27847-auth0-doc-typo' into 'master' Achilleas Pipinellis2017-02-241-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in auth0.md doc 27847-auth0-doc-typoReb2017-02-081-1/+1
* | | | | | | Merge branch '12726-preserve-issues-after-deleting-users' into 'master' Douwe Maan2017-02-2418-18/+320
|\ \ \ \ \ \ \
| * | | | | | | Fix specs for the ghost user feature.12726-preserve-issues-after-deleting-usersTimothy Andrew2017-02-242-3/+5
| * | | | | | | Don't allow deleting a ghost user.Timothy Andrew2017-02-248-5/+59
| * | | | | | | Implement final review comments from @DouweM and @rymaiTimothy Andrew2017-02-246-61/+62
| * | | | | | | Remove the default value for the `users.ghost` database column.Timothy Andrew2017-02-242-7/+3
| * | | | | | | Implement review comments from @rymai and @yorickpeterseTimothy Andrew2017-02-244-81/+61
| * | | | | | | Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-246-6/+44
| * | | | | | | Implement review comments from @DouweM and @nick.thomas.Timothy Andrew2017-02-243-2/+85
| * | | | | | | Extract code from `Namespace#clean_path` for ghost user generation.Timothy Andrew2017-02-244-24/+42
| * | | | | | | Deleting a user shouldn't delete associated issues.Timothy Andrew2017-02-245-4/+129
| * | | | | | | Don't send notifications to ghost users.Timothy Andrew2017-02-241-0/+1
| * | | | | | | Add CE CHANGELOG for #12726.Timothy Andrew2017-02-241-0/+4
* | | | | | | | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-2469-350/+344
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix specDouwe Maan2017-02-242-4/+3
| * | | | | | | | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-2368-349/+344
* | | | | | | | | Merge branch 'api-simplify-variables-validation' into 'master' Rémy Coutable2017-02-241-8/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplyfy variables validation in triggers APIapi-simplify-variables-validationRobert Schilling2017-02-241-8/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue-28619' into 'master' Rémy Coutable2017-02-241-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use correct GitLab Prometheus exporter name in docsLukas Raska2017-02-241-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2017-02-241-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added application password instructions for Gmail/G suite accounts Raphaël Doursenaud2017-02-231-1/+3
* | | | | | | | | | Merge branch 'docs/fix-broken-ci-links' into 'master' Achilleas Pipinellis2017-02-241-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix broken links in CI admin area docsdocs/fix-broken-ci-linksAchilleas Pipinellis2017-02-241-4/+2
* | | | | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-02-241-10/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clarify custom domain detailsBen Bodenmiller2017-02-221-10/+13
* | | | | | | | | | | | Merge branch 'api-remove-owned-groups' into 'master' Sean McGivern2017-02-248-40/+87
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groupsSean McGivern2017-02-2431-36/+268
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Update documentationRobert Schilling2017-02-243-14/+6
| * | | | | | | | | | | | Backport groups API to V3Robert Schilling2017-02-243-0/+74
| * | | | | | | | | | | | API: Use parameter to get owned groups instead of dedicated endpointRobert Schilling2017-02-242-24/+6
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'issue-28653-2' into 'master' Douwe Maan2017-02-241-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use persistent name identifier instead of transient in SAML2 documentationLukas Raska2017-02-241-5/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '3874-correctly-return-json-on-delete-responses' into 'master' Sean McGivern2017-02-249-5/+51
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Return 202 with JSON body on async removals on V4 API3874-correctly-return-json-on-delete-responsesOswaldo2017-02-239-5/+51