summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-07-041-2/+0
|\
| * Merge branch 'master' into dev-masterTomasz Maczukin2016-07-0264-329/+517
| |\
| * \ Merge branch '19312-confidential-issue' into 'master' Douwe Maan2016-06-301-2/+0
| |\ \
| | * | Fixed privilege escalation issue where manually set external users would be r...Patricio Cano2016-06-291-2/+0
* | | | Merge branch 'more_descriptive_git_shell_messages' into 'master' Dmitriy Zaporozhets2016-07-041-2/+7
|\ \ \ \
| * | | | Handle custom Git hook result in GitLab UIValery Sizov2016-07-041-2/+7
* | | | | Merge branch 'save-artifacts_sizes' into 'master' Rémy Coutable2016-07-041-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into save-artifacts_sizesLin Jen-Shin2016-07-0472-358/+591
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use AR callbacks as suggested by:Lin Jen-Shin2016-06-291-1/+0
| * | | | 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-281-1/+1
| * | | | Introduce ci_builds.artifacts_sizes as JSON:Lin Jen-Shin2016-06-281-0/+1
* | | | | Better message for git hooks and file locksValery Sizov2016-07-041-4/+9
| |/ / / |/| | |
* | | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-0134-45/+0
* | | | Merge branch 'fix-relative-root-emoji-support' into 'master' Stan Hu2016-07-011-1/+10
|\ \ \ \
| * | | | Fix emoji paths in relative root configurationsStan Hu2016-07-011-1/+10
* | | | | Merge branch 'todos-api' into 'master' Rémy Coutable2016-07-013-0/+108
|\ \ \ \ \
| * | | | | Support creating a todo on issuables via APItodos-apiRobert Schilling2016-07-011-0/+30
| * | | | | Expose target, filter by state as stringRobert Schilling2016-07-012-7/+7
| * | | | | Add todos API documentation and changelogRobert Schilling2016-07-011-3/+1
| * | | | | pass paginated array when deleting notesRobert Schilling2016-07-011-1/+1
| * | | | | Expose action_nameRobert Schilling2016-07-011-1/+1
| * | | | | Add user to project to see todosRobert Schilling2016-07-011-1/+1
| * | | | | Move to helper, no instance variablesRobert Schilling2016-07-011-9/+9
| * | | | | Fix rebaseRobert Schilling2016-07-011-4/+0
| * | | | | Add Todos APIDouglas Barbosa Alexandre2016-07-013-0/+84
* | | | | | Merge branch 'fix/import-export-events' into 'master' Rémy Coutable2016-07-013-6/+12
|\ \ \ \ \ \
| * | | | | | use has_many relationship with eventsJames Lopez2016-07-011-0/+1
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-07-0125-270/+380
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | bump version - as old exports wont be compatibleJames Lopez2016-06-291-1/+1
| * | | | | | fixing events for import/exportJames Lopez2016-06-291-5/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'refactor-tags-branches-api' into 'master' Rémy Coutable2016-07-012-7/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Ensure that branch and tag names are given in APIrefactor-tags-branches-apiRobert Schilling2016-06-302-7/+7
* | | | | | Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab18592-syntaxhighlighter-slowPaco Guzman2016-07-011-2/+7
| |_|/ / / |/| | | |
* | | | | Merge branch 'fix-external-issue-rendering' into 'master' Robert Speicher2016-06-303-6/+30
|\ \ \ \ \
| * | | | | Handle external issues in IssueReferenceFilterYorick Peterse2016-06-303-6/+30
| | |/ / / | |/| | |
* | | | | Merge branch 'ericidema/gitlab-ce-import-with-github-personal-access-tokens' ...Douwe Maan2016-06-301-14/+31
|\ \ \ \ \
| * | | | | Import from Github using Personal Access Tokens.Eric K Idema2016-06-301-14/+31
* | | | | | Merge branch 'fix_restore_warning' into 'master' Rémy Coutable2016-06-301-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix restore warning messageDrew Blessing2016-06-281-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rubocop/enable-unneeded-capital-w-cop' into 'master' Robert Speicher2016-06-301-1/+1
|\ \ \ \ \
| * | | | | Enable Style/UnneededCapitalW Rubocop coprubocop/enable-unneeded-capital-w-copGrzegorz Bizon2016-06-301-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'remove-converalls-gem' into 'master' Dmitriy Zaporozhets2016-06-301-3/+1
|\ \ \ \ \
| * | | | | Remove coveralls as its unusedremove-converalls-gemZ.J. van de Weg2016-06-301-3/+1
| | |_|/ / | |/| | |
* | | | | Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-291-0/+1
* | | | | Create (if necessary) and link the gitlab-shell secret file on the rake insta...shardsAlejandro Rodríguez2016-06-292-0/+19
* | | | | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-2911-236/+272
| |/ / / |/| | |
* | | | Merge branch 'handle-redis-not-there' into 'master' Stan Hu2016-06-291-3/+7
|\ \ \ \
| * | | | Handle case when Redis cache returns an empty settingStan Hu2016-06-291-1/+1
| * | | | Fix database migrations when Redis is not runningStan Hu2016-06-291-3/+7
View Lorry Controller Status