summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-1829-66/+65
* Merge branch '44981-http-io-trace-with-multi-byte-char' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-181-6/+16
|\
| * Make HTTPIO compatible with multi-byte chars (Extracted from ChunkedIO)Shinya Maeda2018-04-171-6/+16
* | Merge branch 'zj-uri-type-empty' into 'master'Douwe Maan2018-04-181-0/+2
|\ \
| * | Return nil on empty pathZeger-Jan van de Weg2018-04-171-0/+2
| |/
* | [Rails5] Remove `as` keyword from `Gitlab:Ci:Trace:Stream.delegate :valid?`blackst0ne2018-04-181-1/+3
* | Merge branch 'zj-ref-exists-opt-out' into 'master'Nick Thomas2018-04-171-1/+2
|\ \
| * | Move Gitaly RefExists check to OPT_OUTZeger-Jan van de Weg2018-04-121-1/+2
* | | Merge branch 'bvl-ignore-gitlab-pot-in-ee-compat-check' into 'master'Rémy Coutable2018-04-171-1/+1
|\ \ \
| * | | Ignore `locale/gitlab.pot` in ee_compat_checkBob Van Landuyt2018-04-171-1/+1
* | | | Merge branch 'add-dev-check-back-for-deprecations' into 'master'Rémy Coutable2018-04-171-1/+5
|\ \ \ \
| * | | | Add .org? method to Gitlab helperOswaldo Ferreira2018-04-171-1/+5
| | |_|/ | |/| |
* | | | Merge branch '45363-optional-params-on-api-endpoint-produce-invalid-paginatio...Nick Thomas2018-04-171-2/+2
|\ \ \ \
| * | | | [API] Fix URLs in the 'Link' header for 'GET /projects/:id/repository/contrib...Rémy Coutable2018-04-171-2/+2
* | | | | Merge branch '45436-markdown-is-not-rendering-error-loading-viewer-undefined-...Sean McGivern2018-04-172-2/+2
|\ \ \ \ \
| * | | | | make call to 'html_escape' unambiguousBrett Walker2018-04-172-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'sh-memoize-repository-empty' into 'master'Grzegorz Bizon2018-04-171-6/+17
|\ \ \ \ \
| * | | | | Move uncached_has_local_branches? to a private methodStan Hu2018-04-141-10/+10
| * | | | | Fix failing ./spec/lib/backup/repository_spec.rb by clearing the memoized valueStan Hu2018-04-141-0/+4
| * | | | | Memoize Git::Repository#has_visible_content?Stan Hu2018-04-141-0/+7
* | | | | | Merge branch '45406-error-getting-performance-bar-results-for-uuid-regularly-...Phil Hughes2018-04-171-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix flash errors in performance bar for cached responsesSean McGivern2018-04-171-1/+1
| | |/ / / | |/| | |
* | | | | Method to track recoverable exceptions in sentryBob Van Landuyt2018-04-172-4/+24
|/ / / /
* | | | Merge branch 'ab-45247-project-lookups-validation' into 'master'Yorick Peterse2018-04-161-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Validate project path prior to hitting the database.Andreas Brandl2018-04-131-2/+2
* | | | Merge branch 'osw-backport-gl-subdomain-method' into 'master'Rémy Coutable2018-04-161-10/+7
|\ \ \ \
| * | | | Backport GitLab domain helper methodsOswaldo Ferreira2018-04-131-10/+7
| | |/ / | |/| |
* | | | Merge branch '44582-clear-pipeline-status-cache' into 'master'Grzegorz Bizon2018-04-162-10/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Allow `rake cache:clear` clearing pipeline status cache44582-clear-pipeline-status-cacheLin Jen-Shin2018-04-102-10/+15
* | | | Remove bogus '|' symbolJacob Vosmaer (GitLab)2018-04-131-1/+1
| |/ / |/| |
* | | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-132-8/+18
|\ \ \
| * | | Deprecate legacy disk pathsZeger-Jan van de Weg2018-04-122-8/+18
* | | | Feature/add language in repository to apiRoger Rüttimann2018-04-131-0/+5
* | | | Merge branch 'jprovazn-fix-references' into 'master'Douwe Maan2018-04-137-16/+28
|\ \ \ \
| * | | | Fix reference filters in group contextJan Provaznik2018-04-127-16/+28
* | | | | Merge branch 'dm-archived-read-only' into 'master'Robert Speicher2018-04-124-4/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Correct permissions for creating merge requests from issuesBob Van Landuyt2018-04-113-3/+4
| * | | | Rename delete_protected_branch ability to push_to_delete_protected_branch to ...Douwe Maan2018-04-101-1/+1
* | | | | Merge branch 'backport-of-rd-3429-enabling-maximum-file-size-limit-in-reposit...Douwe Maan2018-04-126-7/+139
|\ \ \ \ \
| * | | | | Backport of EE !4989backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-failRubén Dávila2018-04-116-7/+139
* | | | | | Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan2018-04-1211-48/+123
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Support Markdown rendering using multiple projectsrendering-markdown-multiple-projectsYorick Peterse2018-04-1111-48/+123
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'Marin Jankovski2018-04-121-0/+8
|\ \ \ \ \
| * | | | | Add a test for job empty state with missing traceGrzegorz Bizon2018-04-111-1/+1
| * | | | | Revert adding `Empty` extended status to avoid N+1 queriesGrzegorz Bizon2018-04-113-24/+3
| * | | | | Extend specs for detailed build extended statusesGrzegorz Bizon2018-04-111-3/+3
| * | | | | Fix empty state for build that doesn ot have a traceGrzegorz Bizon2018-04-113-1/+30
| |/ / / /
* | | | | Merge branch 'fix/wiki-find-file-gitaly' into 'master'Robert Speicher2018-04-111-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix finding wiki file when Gitaly is enabledAhmad Sherif2018-04-111-1/+1
| |/ / /
* | | | Merge branch 'zj-info-attributes' into 'master'Douwe Maan2018-04-114-59/+35
|\ \ \ \