summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix an N+1 in avatar URLsfix-avatars-n-plus-oneSean McGivern2018-05-318-3/+85
* Merge branch 'gitaly-0.104.0' into 'master'Douwe Maan2018-05-311-1/+1
|\
| * Use Gitaly 0.104.0Jacob Vosmaer2018-05-301-1/+1
* | Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master'Douwe Maan2018-05-316-5/+13
|\ \
| * | Fix encoding error in Gitaly::Commit::TreeEntryKim "BKC" Carlbäcker2018-05-306-5/+13
| |/
* | Merge branch '45520-remove-links-from-web-ide-unexpectedly-navigate-you-to-a-...Phil Hughes2018-05-316-148/+84
|\ \
| * | Resolve "Remove links from Web IDE unexpectedly navigate you to a different p...Sam Beckham2018-05-316-148/+84
|/ /
* | Merge branch 'leipert-port-project-settings' into 'master'Rémy Coutable2018-05-316-42/+50
|\ \
| * | Cleanup code for General Project SettingsLukas Eipert2018-05-316-42/+50
|/ /
* | Merge branch '46903-osw-fix-permitted-params-filtering-on-merge-scheduling' i...Sean McGivern2018-05-313-4/+9
|\ \
| * | Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-303-4/+9
| |/
* | Merge branch '46991-unable-to-start-rails-console-if-using-master-from-gitlab...Sean McGivern2018-05-311-2/+2
|\ \
| * | better handle a missing gitlab-shell versionBrett Walker2018-05-301-2/+2
* | | Merge branch 'rails5-cattr' into 'master'Douwe Maan2018-05-311-3/+1
|\ \ \
| * | | Fix cattr_accessor definitionJan Provaznik2018-05-281-3/+1
* | | | Merge branch 'fj-36819-remove-v3-api' into 'master'Douwe Maan2018-05-3197-16029/+356
|\ \ \ \
| * | | | Removed API endpoint and specsfj-36819-remove-v3-apiFrancisco Javier López2018-05-3097-16029/+356
| | |_|/ | |/| |
* | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |