summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add ailiases for artifact migratablerefactor-artifacts-archiveShinya Maeda2018-08-313-9/+10
* Refactor "artifacts" to "artifacts_archive" and "artifacts_metadata" to "arti...Shinya Maeda2018-08-3128-92/+92
* Merge branch 'ide-multiple-file-uploads' into 'master'Filipa Lacerda2018-08-303-6/+24
|\
| * Enabled multiple uploads in the Web IDEPhil Hughes2018-08-293-6/+24
* | Merge branch '47943-project-milestone-page-deprecation-message' into 'master'Filipa Lacerda2018-08-304-0/+25
|\ \
| * | Add changelog entryKushal Pandya2018-08-281-0/+5
| * | Add milestone tabs deprecation viewKushal Pandya2018-08-281-0/+1
| * | Project Milestone Tabs Deprecation PartialKushal Pandya2018-08-282-0/+19
* | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-08-301-1/+1
|\ \ \
| * | | corrects microsoft_teams.md webhook urlChovin Carlson2018-08-281-1/+1
* | | | Merge branch 'winh-upgrade-license-finder' into 'master'Rémy Coutable2018-08-303-23/+17
|\ \ \ \
| * | | | Upgrade LicenseFinder Gem to v5.4.0Winnie Hellmann2018-08-303-23/+17
|/ / / /
* | | | Merge branch 'schema-changed-ee-backport' into 'master'Rémy Coutable2018-08-302-4/+14
|\ \ \ \
| * | | | Backport schema_changed.sh from EE which prints the diff if the schema is dif...Jasper Maes2018-08-302-4/+14
* | | | | Merge branch 'sh-backport-groups-png-docs' into 'master'11-3-stable-prepare-rc1Rémy Coutable2018-08-301-0/+0
|\ \ \ \ \
| * | | | | Backport doc/user/group/img/groups.png changes from EEStan Hu2018-08-291-0/+0
* | | | | | Merge branch 'update-11-2-3-and-11-1-6' into 'master'Stan Hu2018-08-301-2/+6
|\ \ \ \ \ \
| * | | | | | Add changelog entries for 11.2.3 and 11.1.6Sean McGivern2018-08-301-2/+6
* | | | | | | Merge branch 'feature/whitelist-new-users-as-internal' into 'master'Phil Hughes2018-08-3028-2/+579
|\ \ \ \ \ \ \
| * | | | | | | Allow whitelisting for "external collaborator by default" settingRoger Rüttimann2018-08-3028-2/+579
|/ / / / / / /
* | | | | | | Merge branch 'fj-47229-fix-logo-lfs-tracked' into 'master'Sean McGivern2018-08-309-164/+225
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed project logo when it is LFS trackedFrancisco Javier López2018-08-309-164/+225
|/ / / / / /
* | | | | | Merge branch '41292-users-stuck-on-a-redirect-loop-after-transferring-project...Sean McGivern2018-08-303-2/+37
|\ \ \ \ \ \
| * | | | | | fix path bug and update specsJames Lopez2018-08-302-3/+4
| * | | | | | add changelogJames Lopez2018-08-291-0/+5
| * | | | | | Fix transfer project redirect loopJames Lopez2018-08-291-2/+3
| * | | | | | add specs replicating transfer issueJames Lopez2018-08-291-0/+28
* | | | | | | Merge branch '50414-rubocop-rule-to-enforce-class-methods-over-module' into '...Sean McGivern2018-08-3029-25/+202
|\ \ \ \ \ \ \
| * | | | | | | Minor renames for clarityJacopo2018-08-292-3/+3
| * | | | | | | Handles when ClassMethods is used inside a classJacopo2018-08-292-2/+15
| * | | | | | | Fixes rubocop chain ordinary method after safe navigation operatorJacopo2018-08-291-2/+5
| * | | | | | | Updates code using class_methods over module ClassMethodsJacopo2018-08-2925-25/+25
| * | | | | | | Applies rule only when extending ActiveSupport::ConcernJacopo2018-08-292-3/+44
| * | | | | | | Adds ChangelogJacopo2018-08-291-0/+5
| * | | | | | | Adds Rubocop rule to enforce class_methods over module ClassMethodsJacopo2018-08-293-0/+115
* | | | | | | | Merge branch 'update-hint-for-local-merge' into 'master'Sean McGivern2018-08-301-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Updates hint text for merging branches locally.Pradyumna2018-08-291-2/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-error-500-updating-wikis' into 'master'Sean McGivern2018-08-303-1/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update merge request version in CHANGELOG entryStan Hu2018-08-291-1/+1
| * | | | | | | Fix Error 500s due to encoding issues when Wiki hooks fireStan Hu2018-08-293-1/+18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix_emojis_cutting_and_regressions' into 'master'Annabel Dunstone Gray2018-08-293-2/+10
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix Emojis cutting in the right wayAlexander Popov2018-08-293-2/+10
| |/ / / / /
* | | | | | Merge branch 'move-package-and-qa-to-the-end' into 'master'Rémy Coutable2018-08-291-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Move package-and-qa to the test phaseSean McGivern2018-08-281-1/+1
* | | | | | Merge branch '49800-reorganize-qa-scenarios' into 'master'Rémy Coutable2018-08-2957-901/+1011
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Improve QA scenarios contexts & descriptions consistencyRémy Coutable2018-08-2824-631/+673
| * | | | | Reorganize QA scenarios based on the DevOps cycleRémy Coutable2018-08-2832-0/+49
| * | | | | Allow to pass --tag to bin/qa runRémy Coutable2018-08-285-5/+24
* | | | | | Merge branch '50801-error-getting-performance-bar-results-for-uuid' into 'mas...Phil Hughes2018-08-294-8/+85
|\ \ \ \ \ \
| * | | | | | Warn to console, not flash, when performance bar failsSean McGivern2018-08-291-2/+2