summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixes issues for mr acceptancetiagonbotelho2016-07-062-5/+3
* removes redundant commenttiagonbotelho2016-07-061-1/+0
* refactors to pass values as arguments through optionstiagonbotelho2016-07-062-13/+16
* adds change to CHANGELOG filetiagonbotelho2016-07-061-0/+1
* removes debugging prints from codetiagonbotelho2016-07-055-21/+5
* Merge branch 'rename-repo-files' of gitlab.com:tiagonbotelho/gitlab-ce into r...tiagonbotelho2016-07-041-16/+0
|\
| * Merge branch 'rename-repo-files' of gitlab.com:tiagonbotelho/gitlab-ce into r...tiagonbotelho2016-07-040-0/+0
| |\
| | * remove prints and useless commentstiagonbotelho2016-07-012-3/+1
| | * successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-013-2/+9
| | * implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-013-2/+8
| * | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-045-3/+35
| * | remove prints and useless commentstiagonbotelho2016-07-042-3/+1
| * | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-043-2/+9
| * | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-043-2/+8
* | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-043-1/+19
* | | remove prints and useless commentstiagonbotelho2016-07-041-2/+0
* | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-041-0/+2
* | | refactors blob_controllertiagonbotelho2016-07-046-10/+59
* | | remove prints and useless commentstiagonbotelho2016-07-042-3/+1
* | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-043-2/+9
* | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-043-2/+8
* | | Merge branch 'save-artifacts_sizes' into 'master' Rémy Coutable2016-07-046-21/+69
|\ \ \
| * | | Use describe rather than context for this:save-artifacts_sizesLin Jen-Shin2016-07-041-1/+1
| * | | Explicitly set to nil when artifacts don't exist:Lin Jen-Shin2016-07-041-0/+2
| * | | Merge remote-tracking branch 'upstream/master' into save-artifacts_sizesLin Jen-Shin2016-07-04704-3380/+8041
| |\ \ \ | | |/ /
| * | | Add a new column `artifacts_size` to table `ci_builds` !4964Lin Jen-Shin2016-07-041-0/+1
| * | | Use describe rather than context, feedback from:Lin Jen-Shin2016-07-041-1/+1
| * | | Rename to "successful artifacts upload", feedback:Lin Jen-Shin2016-07-041-4/+4
| * | | Rename shared_examples, feedback:Lin Jen-Shin2016-07-011-4/+4
| * | | Remove migration guide comment:Lin Jen-Shin2016-07-011-3/+0
| * | | Use nil for non-existing files rather than 0Lin Jen-Shin2016-07-012-2/+4
| * | | Use AR callbacks as suggested by:Lin Jen-Shin2016-06-293-4/+11
| * | | Also remove ci_builds.artifacts_size when erasedLin Jen-Shin2016-06-282-0/+2
| * | | Prefer Ci::Build#erase_artifacts!Lin Jen-Shin2016-06-281-2/+1
| * | | Just save the size in total rather than individual filesLin Jen-Shin2016-06-285-36/+14
| * | | Introduce ci_builds.artifacts_sizes as JSON:Lin Jen-Shin2016-06-284-3/+44
| * | | Cleanup the tests a bit in order to extend itLin Jen-Shin2016-06-281-15/+34
* | | | Merge branch 'update-spring-to-1.7.2' into 'master' Rémy Coutable2016-07-041-1/+1
|\ \ \ \
| * | | | Update spring to 1.7.2 to fix hanging rails consoleupdate-spring-to-1.7.2Kamil Trzcinski2016-07-041-1/+1
| | |/ / | |/| |
* | | | Merge branch 'git_hooks_better_message' into 'master' Dmitriy Zaporozhets2016-07-049-28/+36
|\ \ \ \ | |/ / / |/| | |
| * | | Better message for git hooks and file locksValery Sizov2016-07-049-28/+36
|/ / /
* | | Merge branch '13524-keep-around-commits' into 'master' Douwe Maan2016-07-0412-7/+88
|\ \ \
| * | | Document Repository#keep_aroundDouwe Maan2016-07-041-4/+8
| * | | Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-0412-7/+84
* | | | Merge branch 'downgrade-redis-3-2-2' into 'master' Robert Speicher2016-07-032-1/+2
|\ \ \ \
| * | | | Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2Stan Hu2016-07-012-1/+2
| |/ / /
* | | | Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master' Stan Hu2016-07-033-3/+4
|\ \ \ \
| * | | | Update CHANGELOGTakuya Noguchi2016-07-031-0/+1
| * | | | Update RedCloth to 4.3.2 for CVE-2012-6684Takuya Noguchi2016-07-032-3/+3
* | | | | Merge branch '19448-merge-requests-api-has-incorrect-documentation-regarding-...Robert Schilling2016-07-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |