summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-remove-import-retry-count-warning' into 'master'Robert Speicher2018-01-111-2/+2
|\
| * Remove warning noise in ProjectImportOptionsStan Hu2018-01-111-2/+2
* | Merge branch 'dispatcher-dashboard-mr' into 'master'Fatih Acet2018-01-112-3/+10
|\ \
| * | Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mrClement Ho2018-01-101-1/+0
| * | Refactor dispatcher dashboard mr pathClement Ho2018-01-102-2/+10
* | | Merge branch 'dispatcher-boards' into 'master'Fatih Acet2018-01-112-2/+11
|\ \ \
| * | | Refactor dispatcher project boards pathdispatcher-boardsClement Ho2018-01-102-2/+11
| |/ /
* | | Merge branch '41163-improve-cluster-ingress-extra-cost-language' into 'master'Fatih Acet2018-01-111-6/+7
|\ \ \ | |_|/ |/| |
| * | Update Ingress extra cost note to be more generic41163-improve-cluster-ingress-extra-cost-languageEric Eastwood2018-01-111-6/+7
* | | Merge branch '41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master...Annabel Dunstone Gray2018-01-111-1/+0
|\ \ \
| * | | Remove wrong padding from pipelines.scss41221-padding-is-wrong-for-pipeline-dropdowns-on-current-masterWinnie Hellmann2017-12-181-1/+0
* | | | Merge branch 'main-js-tidy-up' into 'master'Filipa Lacerda2018-01-1123-129/+123
|\ \ \ \
| * | | | Tidy up main JS filemain-js-tidy-upPhil Hughes2018-01-1023-129/+123
* | | | | Merge branch 'help-profiles-dispatcher-refactor' into 'master'Phil Hughes2018-01-114-11/+24
|\ \ \ \ \
| * \ \ \ \ Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactorConstance Okoghenun2018-01-11252-5276/+6136
| |\ \ \ \ \
| * | | | | | Removed experimental feature flag unsed depenecy for profiles/preferencesConstance Okoghenun2018-01-112-9/+3
| * | | | | | Refactored profile:* and help:* imports in dispatcherConstance Okoghenun2018-01-095-6/+27
* | | | | | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-1131-0/+35
* | | | | | | Merge branch 'projects-dispatcher-refactor' into 'master'Phil Hughes2018-01-114-20/+42
|\ \ \ \ \ \ \
| * | | | | | | Refactored project:n* imports in dispatcher.jsConstance Okoghenun2018-01-114-20/+42
* | | | | | | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-1110-22/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove soft removals related codeYorick Peterse2018-01-0810-22/+13
* | | | | | | | Merge branch '40920-emphasize-irreversibility-in-warning-message-when-promoti...Annabel Dunstone Gray2018-01-113-3/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Changed copy text for promoting the milestone and labels40920-emphasize-irreversibility-in-warning-message-when-promoting-labels-and-milestonesJose Ivan Vargas2018-01-103-3/+3
* | | | | | | | Merge branch 'qa/gb/define-project-pages-selectors' into 'master'Rémy Coutable2018-01-113-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add selectors coupling for QA project show page objectqa/gb/define-project-pages-selectorsGrzegorz Bizon2018-01-112-2/+2
| * | | | | | | | Define QA project pages views / selectorsGrzegorz Bizon2018-01-111-1/+1
* | | | | | | | | Merge branch '41608-clipboard-vue-button' into 'master'Phil Hughes2018-01-111-1/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds props to allow tooltip config. Breaks tests into specific cases41608-clipboard-vue-buttonFilipa Lacerda2018-01-111-0/+12
| * | | | | | | | | Add tooltip missing to clipboard componentFilipa Lacerda2018-01-101-1/+6
* | | | | | | | | | Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master'Rémy Coutable2018-01-111-6/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Hide new branch and tag links for projects with an empty repoMark Fletcher2018-01-091-6/+7
* | | | | | | | | | | Merge branch '38068-commits-count' into 'master'Yorick Peterse2018-01-111-4/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Denormalize commits count for merge request diffs38068-commits-countJan Provaznik2018-01-101-4/+7
* | | | | | | | | | | Merge branch '41613-fix-redundant-modal' into 'master'Filipa Lacerda2018-01-112-66/+68
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add modal dialog for leave group actionKushal Pandya2018-01-111-11/+37
| * | | | | | | | | | | Move modal dialog to app root componentKushal Pandya2018-01-111-55/+31
* | | | | | | | | | | | Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i...Grzegorz Bizon2018-01-111-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Never set special MR titles for external issuesSean McGivern2018-01-101-6/+2
| * | | | | | | | | | | | Fix incorrect default merge request title when external issue tracker is acti...Benedikt Huss2018-01-091-1/+1
* | | | | | | | | | | | | Merge branch '4020-rebase-message' into 'master'Sean McGivern2018-01-111-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Store only generic message if rebase fails4020-rebase-messageJan Provaznik2018-01-091-3/+5
* | | | | | | | | | | | | | Merge branch 'gcp-fix' into 'master'Kamil Trzciński2018-01-115-18/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update links for GCP instructionsgcp-fixFabio Busatto2018-01-111-3/+3
| * | | | | | | | | | | | | | Fix breadcumb of clusters show pageKamil Trzciński2018-01-111-1/+1
| * | | | | | | | | | | | | | Change failed GCP billing check wordingMatija Čupić2018-01-111-1/+1
| * | | | | | | | | | | | | | Use new tab for link in flashMatija Čupić2018-01-111-2/+1
| * | | | | | | | | | | | | | Fix link to billingKamil Trzciński2018-01-102-2/+3
| * | | | | | | | | | | | | | Fix billing checkingKamil Trzciński2018-01-103-4/+7
| * | | | | | | | | | | | | | Extract GCP billing check as methodMatija Čupić2018-01-101-9/+20
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |