summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Fix email verification badgeClement Ho2018-05-293-3/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bootstrap-ide-new-file-modal' into 'master'Annabel Gray2018-05-292-18/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix web IDE new entry modal form alignmentClement Ho2018-05-292-18/+12
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-292-13/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rbRémy Coutable2018-05-241-0/+10
| * | | | | | | | | | | Reduce CE/EE diff in app/controllers/projects/clusters_controller.rbRémy Coutable2018-05-241-13/+0
* | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Mayra Cabrera2018-05-291-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'security-users-can-update-their-password-without-entering-curre...Mayra Cabrera2018-05-291-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove password and password_confirmation from whitelisted params in Profiles...Tiago Botelho2018-05-071-2/+0
* | | | | | | | | | | | | | Merge branch 'bootstrap-help-block' into 'master'Annabel Gray2018-05-2913-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Replace help-block with form-text.text-mutedClement Ho2018-05-2913-16/+16
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'bootstrap-job-log' into 'master'Annabel Gray2018-05-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Auto wrap job logsClement Ho2018-05-291-0/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'sh-batch-dependent-destroys' into 'master'Robert Speicher2018-05-293-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix project destruction failing due to idle in transaction timeoutssh-batch-dependent-destroysStan Hu2018-05-243-1/+36
* | | | | | | | | | | | | Merge branch 'ab-35364-throttle-updates-last-repository-at' into 'master'Yorick Peterse2018-05-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Throttle updates to Project#last_repository_updated_at.Andreas Brandl2018-05-291-0/+2
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '46758-fallout-of-cacheable-attribute' into 'master'Douwe Maan2018-05-294-37/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set wh...Rémy Coutable2018-05-294-37/+20
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '46885-group-visibility' into 'master'Clement Ho2018-05-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix alignment of visibility options on new group pageAnnabel Dunstone Gray2018-05-291-1/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Add bootstrap fixes that were in EE but were mismatching in CEClement Ho2018-05-293-4/+4
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'branches-fixes' into 'master'Clement Ho2018-05-292-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix branches panel at smaller screen sizesbranches-fixesAnnabel Dunstone Gray2018-05-252-2/+6
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Resolve "Merge request spinner spins forever after loading the diff"Lukas Eipert2018-05-292-15/+18
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '44602-clarify-update-docs-text-about-restrictions' into 'master'Achilleas Pipinellis2018-05-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | include groups in descriptionDavin Walker2018-05-281-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Resolve "Operations navigation menu renders empty menu when user does not hav...Lukas Eipert2018-05-291-0/+3
* | | | | | | | | | | Merge branch '38759-fetch-available-parameters-directly-from-gke-when-creatin...Kamil Trzciński2018-05-2923-145/+938
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Move token_in_session to helper methodMatija Čupić2018-05-282-3/+3
| * | | | | | | | | | overhaul dropdown-dependent statesDennis Tang2018-05-287-31/+59
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-25789-4094/+4918
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update project invalid billing status error messageDennis Tang2018-05-231-1/+1
| * | | | | | | | | | | remove duplicate propertyDennis Tang2018-05-231-5/+0
| * | | | | | | | | | | match state function convention in badgesDennis Tang2018-05-232-5/+3
| * | | | | | | | | | | Merge branch '38759-fetch-available-parameters-directly-from-gke-when-creatin...Dennis Tang2018-05-231-0/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | validate project billing status after selectionDennis Tang2018-05-239-32/+110
| * | | | | | | | | | | | fix testsDennis Tang2018-05-232-9/+14
| * | | | | | | | | | | | validate project billing status after selectionDennis Tang2018-05-239-33/+111
| |/ / / / / / / / / / /
| * | | | | | | | | | | rename vuex actions as per best practicesDennis Tang2018-05-144-21/+21
| * | | | | | | | | | | move state into separate file as per vuex docsDennis Tang2018-05-142-11/+13
| * | | | | | | | | | | eslint!Dennis Tang2018-05-111-2/+0
| * | | | | | | | | | | move errors next to input fieldsDennis Tang2018-05-115-112/+128
| * | | | | | | | | | | fix when no GCP projects are foundDennis Tang2018-05-112-8/+19
| * | | | | | | | | | | clear errors on successful gapi requestDennis Tang2018-05-111-2/+11
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-11300-5451/+11263
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | avoid reuse of translation methodDennis Tang2018-05-111-4/+7
| * | | | | | | | | | | | rename vuex dir to storeDennis Tang2018-05-116-1/+1
| * | | | | | | | | | | | more component cleanupDennis Tang2018-05-113-27/+24
| * | | | | | | | | | | | eslint fixesDennis Tang2018-05-111-1/+0