summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix weird Rails bug that leads to `runner_id=null` in SQL queryDylan Griffith2018-05-311-1/+3
* Ensure we validate Runner#runner_type when persisting RunnerNamespaceDylan Griffith2018-05-311-1/+1
* Improve runner_type validations for Ci::RunnerDylan Griffith2018-05-311-6/+16
* Merge branch '46903-osw-fix-permitted-params-filtering-on-merge-scheduling' i...Sean McGivern2018-05-311-2/+2
|\
| * Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-2/+2
* | Merge branch 'fj-36819-remove-v3-api' into 'master'Douwe Maan2018-05-312-12/+1
|\ \
| * | Removed API endpoint and specsfj-36819-remove-v3-apiFrancisco Javier López2018-05-302-12/+1
| |/
* | Merge branch '46971-extra-whitespace' into 'master'Phil Hughes2018-05-311-1/+1
|\ \
| * \ Merge branch 'master' into 46971-extra-whitespaceFilipa Lacerda2018-05-3132-252/+236
| |\ \
| * | | Remove whitespaceFilipa Lacerda2018-05-301-1/+1
* | | | Merge branch 'dm-relative-url-root-in-development' into 'master'Rémy Coutable2018-05-311-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix various bugs related to relative_url_root in developmentDouwe Maan2018-05-291-1/+1
* | | | Update "col-xs" usage to bootstrap4Paul Slaughter2018-05-303-6/+6
* | | | Merge branch 'sh-move-blob-data-at-public' into 'master'Robert Speicher2018-05-301-8/+8
|\ \ \ \
| * | | | Make Repository#blob_data_at a public methodStan Hu2018-05-301-8/+8
| | |_|/ | |/| |
* | | | Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master'Filipa Lacerda2018-05-301-2/+1
|\ \ \ \
| * | | | Fix   after sign-in with Google buttonfix-nbsp-after-sign-in-with-googleKamil Trzciński2018-05-301-2/+1
* | | | | Merge branch 'leipert-upgrade-eslint' into 'master'Mike Greiling2018-05-3018-161/+120
|\ \ \ \ \
| * | | | | fix `spaced-comment`Lukas Eipert2018-05-297-12/+14
| * | | | | fix `no-unused-vars`Lukas Eipert2018-05-2911-152/+109
| * | | | | Upgrade to eslint `~4.12.1` which is the last known version where the camelca...Lukas Eipert2018-05-291-1/+1
* | | | | | Merge branch '46999-line-profiling-modal-width' into 'master'Clement Ho2018-05-301-6/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix UI broken in line profiling modal due to Bootstrap 4Takuya Noguchi2018-05-311-6/+0
* | | | | | Merge branch '46879-import-project-alignment' into 'master'Clement Ho2018-05-304-65/+63
|\ \ \ \ \ \
| * | | | | | Fix import project by url layoutAnnabel Dunstone Gray2018-05-294-65/+63
* | | | | | | Merge branch '46917-gitlab-is-not-sending-objectstore-timeout-value-to-workho...Kamil Trzciński2018-05-301-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix missing timeout value in object storage pre-authorization callAlessio Caiazza2018-05-291-1/+3
* | | | | | | | Merge branch 'bvl-group-shared-projects-private-api' into 'master'Sean McGivern2018-05-302-1/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Add archived param to the json responsebvl-group-shared-projects-private-apiToon Claes2018-05-301-1/+1
| * | | | | | | | Fix small typosToon Claes2018-05-291-1/+1
| * | | | | | | | Add `shared_projects` endpointBob Van Landuyt2018-05-291-0/+31
* | | | | | | | | Merge branch 'rails5-boolean-cast' into 'master'46973-job-failed-71275338Rémy Coutable2018-05-301-2/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix boolean casting for nil valueJan Provaznik2018-05-291-2/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'Filipa Lacerda2018-05-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix local storage not being cleared after creating a new issueStan Hu2018-05-291-1/+1
* | | | | | | | | Merge branch 'mattermost-api-v4' into 'master'Sean McGivern2018-05-301-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated help text for team list for Mattermost slash commandsHarrison Healey2018-05-291-2/+2
* | | | | | | | | | Merge branch 'render_super' into 'master'Rémy Coutable2018-05-302-4/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Unify app/views/shared/issuable/form/_title.html.hamlLin Jen-Shin2018-05-282-4/+5
* | | | | | | | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-3013-30/+152
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-2913-30/+152
* | | | | | | | | | | | Merge branch 'bootstrap-pull-float' into 'master'Annabel Gray2018-05-308-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Convert remaining pull-* to float-*Clement Ho2018-05-298-15/+15
* | | | | | | | | | | | | Merge branch 'fix-snippet-row' into 'master'Annabel Gray2018-05-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix snippet rowClement Ho2018-05-291-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '46877-bootstrap-4-lists' into 'master'Clement Ho2018-05-3020-32/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove duplicate classesAnnabel Dunstone Gray2018-05-291-2/+2
| * | | | | | | | | | | | | Replace well-list with content-list and hover-listAnnabel Dunstone Gray2018-05-2921-33/+33
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'bootstrap-emails-verify-badge' into 'master'Annabel Gray2018-05-303-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix email verification badgeClement Ho2018-05-293-3/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |