summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ide-jobs-list-componentside-jobs-list-componentsPhil Hughes2018-05-31109-1167/+1278
|\
| * Merge branch '46971-extra-whitespace' into 'master'Phil Hughes2018-05-311-1/+1
| |\
| | * Merge branch 'master' into 46971-extra-whitespaceFilipa Lacerda2018-05-3178-993/+892
| | |\
| | * | Remove whitespaceFilipa Lacerda2018-05-301-1/+1
| * | | Merge branch 'dm-relative-url-root-in-development' into 'master'Rémy Coutable2018-05-313-2/+7
| |\ \ \
| | * | | Fix various bugs related to relative_url_root in developmentDouwe Maan2018-05-293-2/+7
| * | | | Merge branch 'improve-snippets-docs' into 'master'Achilleas Pipinellis2018-05-311-13/+30
| |\ \ \ \
| | * | | | Improve structure of snippets documentationAndreas Kämmerle2018-05-311-13/+30
| |/ / / /
| * | | | Merge branch 'add-project-features-docs' into 'master'Achilleas Pipinellis2018-05-311-0/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add Wiki and Snippets to project feature overviewAndreas Kämmerle2018-05-301-0/+2
| * | | | Update CHANGELOG.md for 10.8.3Mayra Cabrera2018-05-306-26/+14
| * | | | Merge branch '47002-fix-empty-wiki-illustration' into 'master'Clement Ho2018-05-303-6/+6
| |\ \ \ \
| | * | | | 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 'sh-add-usage-ping-api-settings' into 'master'Robert Speicher2018-05-301-0/+1
| |\ \ \ \ \
| | * | | | | Add missing usage_ping_enabled to API settingsStan Hu2018-05-301-0/+1
| | |/ / / /
| * | | | | Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master'Filipa Lacerda2018-05-302-2/+6
| |\ \ \ \ \
| | * | | | | Fix   after sign-in with Google buttonfix-nbsp-after-sign-in-with-googleKamil Trzciński2018-05-302-2/+6
| * | | | | | Merge branch 'leipert-upgrade-eslint' into 'master'Mike Greiling2018-05-3036-774/+615
| |\ \ \ \ \ \
| | * | | | | | Convert spec/javascripts/.eslintrc to yml format as wellLukas Eipert2018-05-302-33/+34
| | * | | | | | fix last lintsLukas Eipert2018-05-293-10/+9
| | * | | | | | disable no-multi-assignLukas Eipert2018-05-291-1/+3
| | * | | | | | fix `spaced-comment`Lukas Eipert2018-05-298-13/+15
| | * | | | | | remove unused createComponentWithMixin from vue spec helpersLukas Eipert2018-05-291-21/+9
| | * | | | | | fix `no-unused-vars`Lukas Eipert2018-05-2918-159/+109
| | * | | | | | use the old indent-rule for nowLukas Eipert2018-05-291-0/+14
| | * | | | | | disable no-restricted-globalsLukas Eipert2018-05-291-0/+2
| | * | | | | | disable prefer-destructuring for nowLukas Eipert2018-05-291-0/+3
| | * | | | | | disable rules that might be conflicting with prettierLukas Eipert2018-05-291-5/+7
| | * | | | | | disable `function-paren-newline` as it conflicts with prettierLukas Eipert2018-05-291-0/+1
| | * | | | | | Upgrade to eslint `~4.12.1` which is the last known version where the camelca...Lukas Eipert2018-05-293-486/+366
| | * | | | | | convert eslintrc to ymlLukas Eipert2018-05-292-56/+53
| * | | | | | | Merge branch '46999-line-profiling-modal-width' into 'master'Clement Ho2018-05-303-8/+7
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix UI broken in line profiling modal due to Bootstrap 4Takuya Noguchi2018-05-313-8/+7
| * | | | | | | 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 'dz-awesome-print-version-unlock' into 'master'Robert Speicher2018-05-302-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove version lock on awesome_print dependencyDmitriy Zaporozhets2018-05-302-2/+2
| * | | | | | | | | Merge branch 'dm-api-projects-members-preload' into 'master'Robert Speicher2018-05-303-16/+26
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Only preload member records for the relevant projects/groups/user in projects...dm-api-projects-members-preloadDouwe Maan2018-05-303-16/+26
| * | | | | | | | | | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-307-73/+25
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-307-73/+25
| * | | | | | | | | | | Merge branch 'sh-simplify-issues-spec' into 'master'Douwe Maan2018-05-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Simplify spec: `2.times.each` -> `2.times`Stan Hu2018-05-301-1/+1
| * | | | | | | | | | | | Merge branch 'match-any-stable-branch' into 'master'Rémy Coutable2018-05-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Consider we might have prefix for stable branchesLin Jen-Shin2018-05-301-1/+1
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch '46917-gitlab-is-not-sending-objectstore-timeout-value-to-workho...Kamil Trzciński2018-05-303-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix missing timeout value in object storage pre-authorization callAlessio Caiazza2018-05-293-1/+10
| * | | | | | | | | | | | | Merge branch 'bump-kubeclient-version-3-1-0' into 'master'Rémy Coutable2018-05-303-6/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status