Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Upgrade Brakeman to 3.4.1brakeman-upgrade | Brian Neel | 2017-01-18 | 2 | -3/+3 |
* | Merge branch '26773-fix-project-statistics-repository-size' into 'master' | Rémy Coutable | 2017-01-18 | 3 | -2/+7 |
|\ | |||||
| * | Fix Project#update_repository_size to convert MB to Bytes properly26773-fix-project-statistics-repository-size | Oswaldo Ferreira | 2017-01-17 | 3 | -2/+7 |
* | | Merge branch 'rs-data_attribute-cleanup' into 'master' | Douwe Maan | 2017-01-18 | 1 | -3/+5 |
|\ \ | |||||
| * | | Correct documentation for `data_attribute` methodrs-data_attribute-cleanup | Robert Speicher | 2017-01-16 | 1 | -3/+5 |
* | | | Merge branch 'backport-time-tracking-ce' into 'master' | Douwe Maan | 2017-01-18 | 52 | -50/+1494 |
|\ \ \ | |||||
| * | | | Fix scss variable refs.backport-time-tracking-ce | Bryce Johnson | 2017-01-15 | 2 | -3/+4 |
| * | | | Fix haml-lint complain. | Ruben Davila | 2017-01-15 | 1 | -1/+1 |
| * | | | Slight modification to the doc | Regis Freyd | 2017-01-15 | 1 | -5/+2 |
| * | | | Bring changes that were present only in EE. | Ruben Davila | 2017-01-15 | 1 | -14/+12 |
| * | | | Prevent including Vue twice | Alfredo Sumaran | 2017-01-15 | 1 | -3/+0 |
| * | | | Backport backend work for time tracking. | Ruben Davila | 2017-01-15 | 30 | -17/+692 |
| * | | | Backport timetracking frontend to CE. | Bryce Johnson | 2017-01-15 | 22 | -16/+792 |
* | | | | Merge branch 'patch-12' into 'master' | Sean McGivern | 2017-01-18 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fixing typo | Cristian Thiago Moecke | 2017-01-18 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'i-#25814-500-error' into 'master' | Sean McGivern | 2017-01-18 | 3 | -1/+44 |
|\ \ \ \ | |||||
| * | | | | refactor rubocop suggestion | Martin Cabrera | 2017-01-16 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-16 | 57 | -457/+615 |
| |\ \ \ \ | |||||
| * | | | | | Refactored ‘from’ and ‘to’ variable preservation | Martin Cabrera | 2017-01-16 | 1 | -10/+6 |
| * | | | | | Added specs for the preservation of the from/to parameter | Martin Cabrera | 2017-01-15 | 1 | -1/+21 |
| * | | | | | from or to get variables gets preserved if the other one is missing | Martin Cabrera | 2017-01-15 | 1 | -2/+9 |
| * | | | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-15 | 74 | -2147/+2400 |
| |\ \ \ \ \ | |||||
| * | | | | | | Changed alert message character: from & to and | Martin Cabrera | 2017-01-15 | 1 | -1/+2 |
| * | | | | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-12 | 92 | -522/+5054 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-11 | 58 | -496/+577 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added specs for branches compare when from & to are empty | Martin Cabrera | 2017-01-10 | 1 | -0/+10 |
| * | | | | | | | | Fix Compare page throws 500 error when any branch/reference is not selected | Martin Cabrera | 2017-01-10 | 2 | -1/+10 |
* | | | | | | | | | Merge branch 'clipboard-button-commit-sha' into 'master' | Sean McGivern | 2017-01-18 | 4 | -3/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update clipboard_button text: Copy commit SHA to clipboardclipboard-button-commit-sha | victorwu | 2017-01-17 | 4 | -3/+6 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '26756-fix-already-intialized-constant-warnings' into 'master' | Robert Speicher | 2017-01-17 | 3 | -7/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Remove some useless require_relative statements26756-fix-already-intialized-constant-warnings | Rémy Coutable | 2017-01-17 | 3 | -7/+0 |
* | | | | | | | | | Merge branch 'mr-tabs-alignment-sidebar-open' into 'master' | Annabel Dunstone Gray | 2017-01-17 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Correctly keeps merge request tabs in place when editting value inmr-tabs-alignment-sidebar-open | Phil Hughes | 2017-01-16 | 2 | -1/+9 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rubocop-todo' into 'master' | Grzegorz Bizon | 2017-01-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Disable all cops in .rubocop_todo.ymlrubocop-todo | Sean McGivern | 2017-01-17 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch '24915_merge_slash_command' into 'master' | Sean McGivern | 2017-01-17 | 22 | -8/+540 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Address MR comments | Jarka Kadlecova | 2017-01-13 | 11 | -26/+60 |
| * | | | | | | | | | | refresh merge widget after using /merge command | Jarka Kadlecova | 2017-01-11 | 5 | -0/+77 |
| * | | | | | | | | | | support `/merge` slash comand for MRs | Jarka Kadlecova | 2017-01-11 | 15 | -8/+429 |
* | | | | | | | | | | | Merge branch 'reduce-queries-milestone-index' into 'master' | Sean McGivern | 2017-01-17 | 3 | -3/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use cached values to compute total issues count in milestone index pagesreduce-queries-milestone-index | Adam Niedzielski | 2017-01-10 | 3 | -3/+10 |
* | | | | | | | | | | | | Merge branch 'fix/keep-artifacts-button-visibility' into 'master' | Sean McGivern | 2017-01-17 | 5 | -9/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility | Grzegorz Bizon | 2017-01-16 | 343 | -3496/+11342 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add method that checks for expiring build artifacts | Grzegorz Bizon | 2017-01-09 | 4 | -17/+40 |
| * | | | | | | | | | | | | | Add changelog for artifacts button visibility fix | Grzegorz Bizon | 2017-01-09 | 1 | -0/+4 |
| * | | | | | | | | | | | | | Do not show artifacts keep button if not allowed | Grzegorz Bizon | 2017-01-09 | 2 | -8/+22 |
* | | | | | | | | | | | | | | Merge branch 'issue_25017' into 'master' | Sean McGivern | 2017-01-17 | 7 | -21/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Show 'too many changes' message for merge requestissue_25017 | Felipe Artur | 2017-01-12 | 8 | -22/+64 |
* | | | | | | | | | | | | | | | Merge branch 'pmq20/gitlab-ce-psvr/persisted' into 'master' | Robert Speicher | 2017-01-17 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Mark Commit persistedpmq20/gitlab-ce-psvr/persisted | P.S.V.R | 2017-01-16 | 2 | -1/+9 |
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |