summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix reading message in access_denied view25955/update-404-pagesPaul Slaughter2018-05-311-0/+2
* Revert access_denied alias for render_403Paul Slaughter2018-05-312-14/+17
* Fix specs with 403 status codePaul Slaughter2018-05-311-6/+6
* Update access_denied alias for render_403Paul Slaughter2018-05-311-11/+8
* Update bootstrap paths in errors.scssPaul Slaughter2018-05-311-7/+7
* Generate fresh gitlab.potPaul Slaughter2018-05-311-18/+132
* Add tests for error pagesPaul Slaughter2018-05-311-0/+42
* Update regression tests for error pagesPaul Slaughter2018-05-311-1/+1
* Add changelog for updated 400 pagesPaul Slaughter2018-05-311-0/+5
* Update 404 and 403 error viewsPaul Slaughter2018-05-317-73/+171
* 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
| | |_|/ / / / / / | |/| | | | | | |