summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pdflab-in-repo' into 'master' Phil Hughes2017-05-0217-15/+327
|\
| * Move PDFLab into GitLabpdflab-in-repoSam Rose2017-04-2817-15/+327
* | Merge branch 'zj-upgrade-carrierwave' into 'master' Douwe Maan2017-05-017-26/+29
|\ \
| * | Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-017-26/+29
|/ /
* | Merge branch 'fix/add-specs-for-request-profiler' into 'master' Douwe Maan2017-05-013-0/+140
|\ \
| * | Add specs for Gitlab::RequestProfilerAhmad Sherif2017-05-013-0/+140
* | | Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-013-1/+16
|\ \ \
| * | | Don't blow up when email has no References headerdont-blow-up-when-email-has-no-references-headerSean McGivern2017-05-013-1/+16
* | | | Merge branch 'dm-blob-download-button' into 'master' Sean McGivern2017-05-016-6/+44
|\ \ \ \
| * | | | Add changelogdm-blob-download-buttonDouwe Maan2017-04-301-0/+4
| * | | | Show Raw button as Download for binary filesDouwe Maan2017-04-305-6/+40
* | | | | Merge branch '31463-group-all-linters' into 'master' Robert Speicher2017-05-013-46/+61
|\ \ \ \ \
| * | | | | Add scripts/static-analysis to run all the static analysers in one go31463-group-all-lintersRémy Coutable2017-05-012-9/+41
| * | | | | Shorten and improve some job namesRémy Coutable2017-05-011-12/+12
| * | | | | Group static-analysis jobs into a single jobRémy Coutable2017-05-012-32/+15
* | | | | | Merge branch '28968-revert-allow-people-with-merge-access-to-create-branches'...Douwe Maan2017-05-013-5/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Prevent people from creating branches if they don't have persmission to pushPawel Chojnacki2017-04-283-5/+7
* | | | | | Merge branch 'dm-snippet-blob-viewers' into 'master' Sean McGivern2017-05-0131-76/+482
|\ \ \ \ \ \
| * | | | | | Add changelogdm-snippet-blob-viewersDouwe Maan2017-04-301-0/+4
| | |/ / / / | |/| | | |
| * | | | | Use blob viewers for snippetsDouwe Maan2017-04-3030-76/+478
* | | | | | Merge branch '30586-fix-gitaly-is-ancestor' into 'master' 31611-sketch43-click-opens-new-tab-and-closes-it-quicklySean McGivern2017-05-015-36/+41
|\ \ \ \ \ \
| * | | | | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-285-36/+41
* | | | | | | Merge branch '31615-fix-dropdown-animation-failure' into 'master' Jacob Schatz2017-05-011-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fixed transient failure related to dropdown animations31615-fix-dropdown-animation-failureLuke "Jared" Bennett2017-04-301-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Update CHANGELOG.md for 9.1.2Timothy Andrew2017-05-019-32/+11
* | | | | | Merge branch 'rs-add_column_with_default_cops' into 'master' Sean McGivern2017-05-0116-13/+121
|\ \ \ \ \ \
| * | | | | | Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrationsrs-add_column_with_default_copsRobert Speicher2017-04-2811-0/+11
| * | | | | | Add AddColumnWithDefaultToLargeTable copRobert Speicher2017-04-283-0/+96
| * | | | | | Rename AddColumnWithDefault to ReversibleAddColumnWithDefaultRobert Speicher2017-04-283-4/+4
| * | | | | | Refactor the AddColumnWithDefault cop to use node matchersRobert Speicher2017-04-281-9/+10
* | | | | | | Merge branch 'patch-18' into 'master' Douwe Maan2017-04-301-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix typoTsvi Mostovicz2017-04-301-1/+1
|/ / / / / /
* | | | | | Merge branch 'revert-c3c465ac' into 'master' Robert Speicher2017-04-296-48/+30
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465acStan Hu2017-04-296-48/+30
|/ / / / / /
* | | | | | Merge branch '31595-emoji-btn' into 'master' Alfredo Sumaran2017-04-291-2/+2
|\ \ \ \ \ \
| * | | | | | Fix emoji alignment31595-emoji-btnAnnabel Dunstone Gray2017-04-281-2/+2
| |/ / / / /
* | | | | | Merge branch 'patch-21' into 'master' Stan Hu2017-04-291-1/+1
|\ \ \ \ \ \
| * | | | | | fix link to MR 10416Ben Bodenmiller2017-04-291-1/+1
|/ / / / / /
* | | | | | Merge branch 'rs-trigger-click' into 'master' Stan Hu2017-04-292-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Another change from .click -> .trigger('click') to make spec passStan Hu2017-04-281-1/+1
| * | | | | Change from .click -> .trigger('click') to make spec passrs-trigger-clickRobert Speicher2017-04-281-1/+1
| |/ / / /
* | | | | Merge branch 'docs/ldap-clarify-uid' into 'master' Marcia Ramos2017-04-281-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update ldap.md to clarify uid should list the attribute not the valuedocs/ldap-clarify-uidLee Matos2017-04-271-3/+3
* | | | | Merge branch 'tc-no-todo-service-select' into 'master' Robert Speicher2017-04-286-30/+48
|\ \ \ \ \
| * | | | | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-selectToon Claes2017-04-276-30/+48
* | | | | | Merge branch '31500-fix-rspec_profiling-reporting' into 'master' Robert Speicher2017-04-284-11/+10
|\ \ \ \ \ \
| * | | | | | Resolve "rspec_profiling is enabled for MySQL"Rémy Coutable2017-04-284-11/+10
|/ / / / / /
* | | | | | Merge branch 'enable-spec-file-name-cop' into 'master' Robert Speicher2017-04-2836-591/+348
|\ \ \ \ \ \
| * | | | | | Enable RSpec/FilePath copenable-spec-file-name-copSean McGivern2017-04-2636-591/+348
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' Sean McGivern2017-04-2818-39/+26
|\ \ \ \ \ \
View Lorry Controller Status