summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'rs-gitalb-com-staging' into 'master' Robert Speicher2016-06-291-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Update `Gitlab.com?` to support stagingrs-gitalb-com-stagingRobert Speicher2016-06-271-1/+6
* | | | Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-293-3/+3
| |/ / |/| |
* | | Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-0/+13
|\ \ \ | |_|/ |/| |
| * | Bump workhorse versionzj-workhorse-format-patchZ.J. van de Weg2016-06-281-4/+4
| * | Workhorse to serve email diffsZ.J. van de Weg2016-06-281-0/+13
| |/
* | Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' Rémy Coutable2016-06-281-3/+3
|\ \
| * | Remove redundant check in commit builds API endpointfix/builds-api-builds-for-commit-searchGrzegorz Bizon2016-06-281-2/+0
| * | Improve commit builds API endpoint RESTful behaviorGrzegorz Bizon2016-06-281-1/+3
| * | Find all builds for commit if multiple pipelinesGrzegorz Bizon2016-06-281-3/+3
* | | Use clock_gettime for all performance timestampsperformance-clock-adjustmentsYorick Peterse2016-06-284-19/+34
* | | Unused got variable with very bad performancePaco Guzman2016-06-281-1/+0
|/ /
* | support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-271-3/+3
* | make #custom_language privatehttp://jneen.net/2016-06-271-8/+8
* | appease rubocophttp://jneen.net/2016-06-271-2/+1
* | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-272-6/+25
* | Rename Licenses API to License Templates APIDrew Blessing2016-06-272-3/+3
|/
* Merge branch 'fix/sidekiq-mem-killer-debug' into 'master' Rémy Coutable2016-06-271-2/+2
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/sidekiq-mem...James Lopez2016-06-2718-78/+374
| |\
| * | better debugging for memory killer middlewarefix/sidekiq-mem-killer-debugJames Lopez2016-06-271-2/+2
* | | Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-271-1/+9
| |/ |/|
* | Merge branch 'refactor/ci-config-add-entry-error' into 'master' Rémy Coutable2016-06-2710-46/+134
|\ \
| * \ Merge branch 'master' into refactor/ci-config-add-entry-errorrefactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-2043-122/+1503
| |\ \
| * | | Extract CI entry config hash validation to validatorGrzegorz Bizon2016-06-172-7/+9
| * | | Merge branch 'master' into refactor/ci-config-add-entry-errorGrzegorz Bizon2016-06-1717-66/+155
| |\ \ \
| * | | | Add first custom validator for new ci configGrzegorz Bizon2016-06-173-9/+21
View Lorry Controller Status