summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Upgrade Brakeman to 3.4.1brakeman-upgradeBrian Neel2017-01-182-3/+3
* Merge branch '26773-fix-project-statistics-repository-size' into 'master' Rémy Coutable2017-01-183-2/+7
|\
| * Fix Project#update_repository_size to convert MB to Bytes properly26773-fix-project-statistics-repository-sizeOswaldo Ferreira2017-01-173-2/+7
* | Merge branch 'rs-data_attribute-cleanup' into 'master' Douwe Maan2017-01-181-3/+5
|\ \
| * | Correct documentation for `data_attribute` methodrs-data_attribute-cleanupRobert Speicher2017-01-161-3/+5
* | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-1852-50/+1494
|\ \ \
| * | | Fix scss variable refs.backport-time-tracking-ceBryce Johnson2017-01-152-3/+4
| * | | Fix haml-lint complain.Ruben Davila2017-01-151-1/+1
| * | | Slight modification to the docRegis Freyd2017-01-151-5/+2
| * | | Bring changes that were present only in EE.Ruben Davila2017-01-151-14/+12
| * | | Prevent including Vue twiceAlfredo Sumaran2017-01-151-3/+0
| * | | Backport backend work for time tracking.Ruben Davila2017-01-1530-17/+692
| * | | Backport timetracking frontend to CE.Bryce Johnson2017-01-1522-16/+792
* | | | Merge branch 'patch-12' into 'master' Sean McGivern2017-01-181-1/+1
|\ \ \ \
| * | | | Fixing typoCristian Thiago Moecke2017-01-181-1/+1
|/ / / /
* | | | Merge branch 'i-#25814-500-error' into 'master' Sean McGivern2017-01-183-1/+44
|\ \ \ \
| * | | | refactor rubocop suggestionMartin Cabrera2017-01-161-1/+1
| * | | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-1657-457/+615
| |\ \ \ \
| * | | | | Refactored ‘from’ and ‘to’ variable preservationMartin Cabrera2017-01-161-10/+6
| * | | | | Added specs for the preservation of the from/to parameter Martin Cabrera2017-01-151-1/+21
| * | | | | from or to get variables gets preserved if the other one is missingMartin Cabrera2017-01-151-2/+9
| * | | | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-1574-2147/+2400
| |\ \ \ \ \
| * | | | | | Changed alert message character: from & to and Martin Cabrera2017-01-151-1/+2
| * | | | | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-1292-522/+5054
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-1158-496/+577
| |\ \ \ \ \ \ \
| * | | | | | | | Added specs for branches compare when from & to are emptyMartin Cabrera2017-01-101-0/+10
| * | | | | | | | Fix Compare page throws 500 error when any branch/reference is not selectedMartin Cabrera2017-01-102-1/+10
* | | | | | | | | Merge branch 'clipboard-button-commit-sha' into 'master' Sean McGivern2017-01-184-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update clipboard_button text: Copy commit SHA to clipboardclipboard-button-commit-shavictorwu2017-01-174-3/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch '26756-fix-already-intialized-constant-warnings' into 'master' Robert Speicher2017-01-173-7/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Remove some useless require_relative statements26756-fix-already-intialized-constant-warningsRémy Coutable2017-01-173-7/+0
* | | | | | | | | Merge branch 'mr-tabs-alignment-sidebar-open' into 'master' Annabel Dunstone Gray2017-01-172-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly keeps merge request tabs in place when editting value inmr-tabs-alignment-sidebar-openPhil Hughes2017-01-162-1/+9
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rubocop-todo' into 'master' Grzegorz Bizon2017-01-171-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable all cops in .rubocop_todo.ymlrubocop-todoSean McGivern2017-01-171-2/+2
* | | | | | | | | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-1722-8/+540
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Address MR commentsJarka Kadlecova2017-01-1311-26/+60
| * | | | | | | | | | refresh merge widget after using /merge commandJarka Kadlecova2017-01-115-0/+77
| * | | | | | | | | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-1115-8/+429
* | | | | | | | | | | Merge branch 'reduce-queries-milestone-index' into 'master' Sean McGivern2017-01-173-3/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use cached values to compute total issues count in milestone index pagesreduce-queries-milestone-indexAdam Niedzielski2017-01-103-3/+10
* | | | | | | | | | | | Merge branch 'fix/keep-artifacts-button-visibility' into 'master' Sean McGivern2017-01-175-9/+49
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibilityGrzegorz Bizon2017-01-16343-3496/+11342
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add method that checks for expiring build artifactsGrzegorz Bizon2017-01-094-17/+40
| * | | | | | | | | | | | | Add changelog for artifacts button visibility fixGrzegorz Bizon2017-01-091-0/+4
| * | | | | | | | | | | | | Do not show artifacts keep button if not allowedGrzegorz Bizon2017-01-092-8/+22
* | | | | | | | | | | | | | Merge branch 'issue_25017' into 'master' Sean McGivern2017-01-177-21/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-128-22/+64
* | | | | | | | | | | | | | | Merge branch 'pmq20/gitlab-ce-psvr/persisted' into 'master' Robert Speicher2017-01-172-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Mark Commit persistedpmq20/gitlab-ce-psvr/persistedP.S.V.R2017-01-162-1/+9
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |