summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Load EE fixtures from ee/ directory in Jestwinh-separate-frontend-fixturesWinnie Hellmann2019-05-022-4/+7
* Load EE fixtures from ee/ directory in KarmaWinnie Hellmann2019-05-022-2/+7
* Generate EE frontend fixtures into ee/ directoryWinnie Hellmann2019-05-021-1/+1
* Allow to override Gitlab.ee? with IS_GITLAB_EEWinnie Hellmann2019-05-021-1/+5
* Ignore PDF and balsamiq fixture filesWinnie Hellmann2019-05-022-2/+2
* Merge branch '28741-play-all-manual-jobs' into 'master'Douglas Barbosa Alexandre2019-05-0228-8/+600
|\
| * Adds a way to start multiple manual jobs in stageMayra Cabrera2019-05-0228-8/+600
|/
* Merge branch '5966-rebase-with-block' into 'master'Douwe Maan2019-05-029-20/+219
|\
| * Add support for two-step Gitaly Rebase RPCLuke Duncalfe2019-05-029-20/+219
|/
* Merge branch '27777-drop-projects-ci_id-column' into 'master'Douglas Barbosa Alexandre2019-05-025-54/+30
|\
| * Remove unused projects.ci_id column27777-drop-projects-ci_id-columnDmitriy Zaporozhets2019-05-025-54/+30
* | Merge branch 'remove-comment-personal-snippet-permission' into 'master'Douwe Maan2019-05-025-37/+44
|\ \
| * | Remove the `comment_personal_snippet` permissionremove-comment-personal-snippet-permissionSean McGivern2019-05-025-37/+44
* | | Merge branch 'issue-61038-deploy-chat-message-update' into 'master'Douglas Barbosa Alexandre2019-05-026-8/+31
|\ \ \
| * | | Update deployment chat message notificationJason Goodman2019-05-026-8/+31
|/ / /
* | | Merge branch 'ac-package-storage-stats' into 'master'Andreas Brandl2019-05-0212-30/+96
|\ \ \
| * | | Add packages_size to ProjectStatisticsAlessio Caiazza2019-05-0212-30/+96
|/ / /
* | | Merge branch '9932-fix-deprecated-attribute_changed-ce' into 'master'Andreas Brandl2019-05-0216-66/+77
|\ \ \
| * | | Remove deprecated uses of attribute_changed?9932-fix-deprecated-attribute_changed-ceHeinrich Lee Yu2019-04-3016-66/+77
* | | | Merge branch '10694-propagate-env-vars-for-gitlab-own-ci-sast-depscan-ce' int...Douwe Maan2019-05-021-8/+46
|\ \ \ \
| * | | | Update ENV vars syntax for reports.ci.ymlVictor Zagorodny2019-05-021-8/+46
|/ / / /
* | | | Merge branch '60777-uninstall-button' into 'master'Phil Hughes2019-05-0219-143/+591
|\ \ \ \
| * | | | Uninstall application confirm modal componentEnrique Alcántara2019-05-0219-143/+591
|/ / / /
* | | | Merge branch 'js-i18n-diff-notes' into 'master'Phil Hughes2019-05-027-14/+50
|\ \ \ \
| * | | | Internationalisation of diff_note directoryBrandon Labuschagne2019-05-027-14/+50
|/ / / /
* | | | Merge branch 'js-i18n-pages' into 'master'Filipa Lacerda2019-05-026-22/+81
|\ \ \ \
| * | | | Internationalisation of pages directoryBrandon Labuschagne2019-05-026-22/+81
|/ / / /
* | | | Merge branch 'fix-ide-relative-url-bug' into 'master'Phil Hughes2019-05-023-7/+24
|\ \ \ \
| * | | | Fix IDE get file data with '/' as relative rootfix-ide-relative-url-bugPaul Slaughter2019-04-303-7/+24
* | | | | Merge branch 'tc-improve-db-process' into 'master'Andreas Brandl2019-05-021-3/+5
|\ \ \ \ \
| * | | | | Escape the usernames to avoid mentionsToon Claes2019-05-021-3/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'js-i18n-merge-conflict' into 'master'Fatih Acet2019-05-023-8/+37
|\ \ \ \ \
| * | | | | Internationalisation of merge_conflicts directoryBrandon Labuschagne2019-05-023-8/+37
|/ / / / /
* | | | | Merge branch 'js-i18n-t-directories' into 'master'Fatih Acet2019-05-023-2/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Internationalisation of javascript/t* directoriesBrandon Labuschagne2019-05-023-2/+11
|/ / / /
* | | | Merge branch '59898-fix-the-following-style-lint-errors-and-warnings-for-app-...Filipa Lacerda2019-05-0214-62/+27
|\ \ \ \
| * | | | Fix commits.scss style-lint errors59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scssScott Hampton2019-04-2514-62/+27
* | | | | Merge branch 'masked-variables-docs-update' into 'master'Filipa Lacerda2019-05-022-4/+6
|\ \ \ \ \
| * | | | | Clarify masked variable message, add link to docsmasked-variables-docs-updatemfluharty2019-04-182-4/+6
* | | | | | Merge branch '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-man...Douwe Maan2019-05-028-16/+24
|\ \ \ \ \ \
| * | | | | | Apply suggestion to doc/ci/pipelines.md53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobsMiranda Fluharty2019-05-011-4/+2
| * | | | | | Update documentation to explain job retryabilitymfluharty2019-04-231-0/+5
| * | | | | | Update specs that use retryable canceled jobsmfluharty2019-04-195-15/+15
| * | | | | | Make canceled jobs not retryablemfluharty2019-04-182-1/+6
* | | | | | | Merge branch 'patch-52' into 'master'Marcia Ramos2019-05-021-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | fix typoMorris-Chen2019-04-301-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jprovazn-graphql-opentracing' into 'master'Bob Van Landuyt2019-05-026-40/+90
|\ \ \ \ \ \
| * | | | | | Add opentracing integration for graphqlJan Provaznik2019-05-026-40/+90
|/ / / / / /
* | | | | | Merge branch 'sh-allow-equal-level-in-subgroup-membership' into 'master'James Lopez2019-05-026-5/+20
|\ \ \ \ \ \
| * | | | | | Allow a member to have an access level equal to parent groupsh-allow-equal-level-in-subgroup-membershipStan Hu2019-04-306-5/+20