summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable mapping to nil in enumsrails5-enum-nilJan Provaznik2018-05-313-21/+36
* Merge branch 'fix-snippets-embed' into 'master'Annabel Gray2018-05-312-21/+5
|\
| * Fix snippets embed formClement Ho2018-05-312-21/+5
|/
* Merge branch 'rails5-active-sup-subscriber' into 'master'Rémy Coutable2018-05-312-1/+6
|\
| * Make ActiveRecordSubscriber rails 5 compatibleJarka Kadlecová2018-05-312-1/+6
* | Merge branch 'issue_45082' into 'master'Douwe Maan2018-05-315-230/+452
|\ \
| * | Add merge requests list endpoint for groupsFelipe Artur2018-05-315-230/+452
|/ /
* | Merge branch '46552-fixes-redundant-message-for-failure-reasons' into 'master'Grzegorz Bizon2018-05-315-13/+26
|\ \
| * | Moves script_failure conditional over lambda46552-fixes-redundant-message-for-failure-reasonsMayra Cabrera2018-05-301-2/+2
| * | Removes redundant error message for script failuresMayra Cabrera2018-05-245-13/+26
* | | Merge branch '41587-osw-mr-metrics-migration-take-two' into 'master'Grzegorz Bizon2018-05-3112-5/+138
|\ \ \
| * | | Ensure metrics regardless of being imported on MRs41587-osw-mr-metrics-migration-take-twoOswaldo Ferreira2018-05-303-2/+2
| * | | Take two for MR metrics population background migrationOswaldo Ferreira2018-05-309-3/+136
* | | | Merge branch 'add-yarn-clean-step' into 'master'Mike Greiling2018-05-312-1/+8
|\ \ \ \
| * | | | Add yarn clean step, to delete production compiled assetsadd-yarn-clean-stepJose2018-05-292-1/+8
* | | | | 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