summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport of 5942-extract-ee-specific-filesccr/backport_of_extract_ee_filesChantal Rollison2018-05-311-13/+17
* Merge branch '46799-fix-tabs-bs4' into 'master'Clement Ho2018-05-315-26/+36
|\
| * Fix active tab stylingAnnabel Gray2018-05-315-26/+36
|/
* Merge branch 'winh-capybara-html-hack-docs' into 'master'Clement Ho2018-05-311-0/+4
|\
| * Add link to hack for styling Capybara HTML dumpsWinnie Hellmann2018-05-311-0/+4
|/
* Merge branch '44184-issues_ical_feed' into 'master'Douwe Maan2018-05-3169-186/+569
|\
| * Export assigned issues in iCalendar feedImre Farkas2018-05-3169-186/+569
|/
* Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master'Nick Thomas2018-05-312-1/+6
|\
| * Eliminate cached N+1 queries for projects in Issue APIStan Hu2018-05-312-1/+6
* | Merge branch 'rails5-fix-46230' into 'master'Rémy Coutable2018-05-312-6/+11
|\ \
| * | Use strings as properties key in kubernetes service spec.Jasper Maes2018-05-302-6/+11
* | | Merge branch 'gitignore-vendor-gitaly-ruby' into 'master'Rémy Coutable2018-05-311-0/+1
|\ \ \
| * | | Add /vendor/gitaly-ruby to gitignoreJacob Vosmaer2018-05-301-0/+1
| |/ /
* | | Merge branch 'rails5-calendar' into 'master'Yorick Peterse2018-05-311-1/+1
|\ \ \
| * | | Replace .having with .where in calendar queryJan Provaznik2018-05-301-1/+1
* | | | Merge branch 'rails5-exists-query' into 'master'Yorick Peterse2018-05-311-5/+3
|\ \ \ \
| * | | | Replace `.exists` with `EXISTS ()`Jan Provaznik2018-05-281-5/+3
* | | | | 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
|\ \ \ \ \ \ \ \