summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* test id fixfix/ci-failure-testJames Lopez2018-09-061-5/+5
* fix specJames Lopez2018-09-061-8/+6
* fix specJames Lopez2018-09-061-1/+1
* fix specJames Lopez2018-09-061-7/+4
* fix specJames Lopez2018-09-061-2/+2
* fix web upload strategyJames Lopez2018-09-061-2/+2
* update code based on feedbackJames Lopez2018-09-063-12/+4
* fix specsJames Lopez2018-09-062-30/+10
* fix namespace specJames Lopez2018-09-062-2/+2
* add changelog [ci skip]James Lopez2018-09-061-0/+5
* fix uploads managerJames Lopez2018-09-063-10/+5
* fix avatar restorer/saver and update specs. Also fixed static analysis.James Lopez2018-09-065-8/+12
* fix specsJames Lopez2018-09-062-14/+2
* fix specJames Lopez2018-09-061-0/+4
* refactor more Import/Export specsJames Lopez2018-09-067-203/+30
* refactor specs with stubbed object storage flagJames Lopez2018-09-069-306/+24
* remove export project path logicJames Lopez2018-09-0613-183/+12
* updated docs, refactor more import/export codeJames Lopez2018-09-067-64/+4
* refactor code to remove object storage flag from Import/ExportJames Lopez2018-09-0610-79/+8
* Merge branch 'docs/usage-statistics-typo' into 'master'Marcia Ramos2018-09-061-2/+4
|\
| * Add link to EE MRAchilleas Pipinellis2018-09-061-0/+1
| * link formatting and typoJames Komara2018-09-061-2/+3
* | Merge branch '44943-update-presentation-for-sso-providers-on-log-in-page' int...Phil Hughes2018-09-0618-51/+57
|\ \
| * | Resolve "Update presentation for SSO providers on log in page"Martin Wortschack2018-09-0618-51/+57
|/ /
* | Merge branch 'rails5-explicit-hashed-path-check' into 'master'Rémy Coutable2018-09-062-1/+9
|\ \ | |/ |/|
| * Explicit hashed path check for trace, prevents background migration from acce...Jasper Maes2018-09-052-1/+9
* | Merge branch 'sh-add-ua-to-lograge-logs' into 'master'Sean McGivern2018-09-063-1/+8
|\ \
| * | Add User-Agent to production_json.logStan Hu2018-09-053-1/+8
* | | Merge branch 'bw-commonmark-for-files-docs' into 'master'Sean McGivern2018-09-061-8/+38
|\ \ \
| * | | Update user markdown documentation for CommonMarkBrett Walker2018-09-061-8/+38
|/ / /
* | | Merge branch 'bw-commonmark-for-files' into 'master'Sean McGivern2018-09-0625-52/+285
|\ \ \
| * | | remove guard clause and add comment on performaceBrett Walker2018-09-051-3/+7
| * | | added feature flag 'commonmark_for_repositories'Brett Walker2018-09-054-2/+33
| * | | add 'default_enabled' to feature flagsBrett Walker2018-09-054-8/+27
| * | | move logic into legacy_render_context helper methodBrett Walker2018-09-059-16/+25
| * | | render using RedCarpet if legacy_render parameter is setBrett Walker2018-09-0516-28/+181
| * | | test that wiki links with spaces works in wiki pipelineBrett Walker2018-09-051-0/+14
| * | | Enable CommonMark for files and wikisBrett Walker2018-09-054-10/+9
| * | | url_helpers were not available on a code reloadBrett Walker2018-09-051-9/+13
| | |/ | |/|
* | | Merge branch 'rs-line-break-around-conditional-cop' into 'master'Sean McGivern2018-09-062-1/+22
|\ \ \
| * | | Fix LineBreakAroundConditionalBlock cop for a conditional after rescueRobert Speicher2018-09-052-1/+22
* | | | Merge branch '44704-improve-project-overview-ui' into 'master'Phil Hughes2018-09-0632-354/+705
|\ \ \ \
| * | | | Resolve "Improve project overview UI"Dennis Tang2018-09-0632-354/+705
|/ / / /
* | | | Merge branch 'monaco-upgrade' into 'master'Tim Zallmann2018-09-063-8/+13
|\ \ \ \
| * | | | Upgraded Monaco editor versionPhil Hughes2018-09-053-8/+13
* | | | | Merge branch 'ce-5306-more-custom-templates' into 'master'Robert Speicher2018-09-066-23/+139
|\ \ \ \ \
| * | | | | Backport changes to Gitlab::Tempalte::BaseTemplateNick Thomas2018-09-051-2/+6
| * | | | | Rename BlobsHelper#dropdown_namesNick Thomas2018-09-051-6/+6
| * | | | | Allow the TemplateFinder to handle licenses as wellNick Thomas2018-09-053-3/+28
| * | | | | Convert global templates to vendored templates via a ::TemplateFinderNick Thomas2018-09-054-19/+79