summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* rubocop fixDennis Tang2018-06-061-1/+0
* cleanupDennis Tang2018-06-052-14/+1
* redirect back to form if token expiresDennis Tang2018-06-051-9/+13
* split into gcp and user controllers againDennis Tang2018-06-059-132/+152
* restore .signin-with-google class for spec testsDennis Tang2018-06-051-3/+4
* fix blank space after google signin imageDennis Tang2018-06-051-2/+1
* Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-0416-42/+61
|\
| * Add ability to search wiki titlesFrancisco Javier López2018-06-045-29/+29
| * Merge branch 'ide-highlighter-type-fox' into 'master'Filipa Lacerda2018-06-041-1/+1
| |\
| | * Fixed typo in commit message help popoveride-highlighter-type-foxPhil Hughes2018-06-011-1/+1
| * | Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan2018-06-042-3/+3
| |\ \
| | * | Fix attr_encryption key settingsStan Hu2018-06-022-3/+3
| * | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-02130-417/+1479
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-01145-840/+1054
| |\ \ \
| * \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-30114-466/+1453
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-28715-3356/+3767
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-2267-513/+706
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-1744-267/+502
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-1425-223/+213
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix static analysysShinya Maeda2018-05-116-6/+6
| * | | | | | | | | Remove numericality as it's redandant with integer column and validates nil IIDShinya Maeda2018-05-111-1/+1
| * | | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-1110-91/+26
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix ensure_iid! method override problemShinya Maeda2018-05-101-2/+2
| * | | | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-1018-66/+79
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-0912-38/+46
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix specShinya Maeda2018-05-081-1/+1
| * | | | | | | | | | | | Decouple to_params from AtomicInternalId concernShinya Maeda2018-05-087-6/+15
| * | | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-08246-2268/+5244
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use **CI_PIPELINE_IID**Kamil Trzciński2018-05-031-1/+1
| * | | | | | | | | | | | | Make Atomic Internal ID work for pipelinesKamil Trzciński2018-05-032-8/+14
| * | | | | | | | | | | | | Revert column name changeShinya Maeda2018-05-031-2/+2
| * | | | | | | | | | | | | Expose CI_PIPELINE_IID_PER_PROJECT variableShinya Maeda2018-05-031-1/+2
| * | | | | | | | | | | | | Add per-project pipeline idShinya Maeda2018-05-032-1/+4
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-01141-506/+1681
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix bootstrap 4 file inputsClement Ho2018-06-011-0/+6
| * | | | | | | | | | | | | Merge branch 'fix-feature-memoization' into 'master'Stan Hu2018-06-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Remove ambiguity in Group class causing build failuresStan Hu2018-06-011-1/+1
| * | | | | | | | | | | | | | Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-016-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-296-7/+7
| * | | | | | | | | | | | | | | Merge branch 'revert-c640e579' into 'master'Clement Ho2018-06-013-3/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Revert "Merge branch '46833-sticky-polyfill' into 'master'"Clement Ho2018-06-013-3/+49
| * | | | | | | | | | | | | | | | Resolve "Branch names in system notes have incorrect color"Clement Ho2018-06-012-4/+6
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Adds "the" to the new label page to correct the sentence.Sam Beckham2018-06-012-2/+2
| * | | | | | | | | | | | | | | Update position sticky polyfillPaul Slaughter2018-06-013-49/+3
| * | | | | | | | | | | | | | | Merge branch '47113-modal-header-styling-is-broken' into 'master'Filipa Lacerda2018-06-0117-27/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Updated the styling for modal titlessamdbeckham2018-06-017-8/+7
| | * | | | | | | | | | | | | | Updates a load of modal headers to use better markupsamdbeckham2018-06-0116-21/+32
| * | | | | | | | | | | | | | | Merge branch 'ce-6145-extract-app-views-shared-issuable' into 'master'Robert Speicher2018-06-013-8/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Unify app/views/shared/issuable/form/_merge_params.html.hamlLin Jen-Shin2018-06-011-7/+3
| | * | | | | | | | | | | | | | | Unify app/views/shared/issuable/_sidebar.html.hamlLin Jen-Shin2018-06-011-1/+6
View Lorry Controller Status