summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rc/gitlab-qa-89' into 'master'10-2-stable-prepare-rc1Grzegorz Bizon2017-11-1010-21/+40
| | | | | | Change Page::Main::Entry to only visit an entrypoint and introduce Page::Main::Login to handle actual log-in See merge request gitlab-org/gitlab-ce!15283
* Merge branch 'fix-502-mrs-with-lots-of-versions' into 'master'Yorick Peterse2017-11-102-1/+19
| | | | | | | | | | | Fix another timeout when searching for pipelines Closes #39054 See merge request gitlab-org/gitlab-ce!15322 (cherry picked from commit 0517b9e341a2960c54faa69717628225ed50c418) ec73ecb0 Fix another timeout when searching for pipelines
* Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann2017-11-101-4/+18
| | | | | | | | | | | | Improve breadcrumbs clipping Closes #37920 See merge request gitlab-org/gitlab-ce!15164 (cherry picked from commit 5d5d7f914c06a18dea567c8d90d0028fb3f86d07) cb2d2bc3 Remove max-width on desktop 738aec70 Dynamically truncate breadcrumbs
* Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan2017-11-103-5/+34
| | | | | | | | | | | | | | Icon Sprite URL needs to be local even if asset_host is set See merge request gitlab-org/gitlab-ce!15289 (cherry picked from commit e482a4d59dae6437a64ae4ccbe6976ffced7b9ba) 25eea058 Icon Sprite URL is also local even if asset_host is set 81eaf171 Fixed URL Matching in Tests 687e7dea Put Icons Path in Helper fb1b88de Missing the local url 01240a18 Fixed Function + Test based on MR fce34b4b Removed Brackets
* Merge branch '39109-reenable-scroll-job' into 'master'Phil Hughes2017-11-102-26/+29
| | | | | | | | | | | | | Enables scroll to bottom once user has scrolled back to bottom in job log Closes #34846 and #39109 See merge request gitlab-org/gitlab-ce!15260 (cherry picked from commit a030a4a8daf5abd0ef6a3339666b38cdc688fff8) ce86fba0 Enables scroll to bottom once user has scrolled back to bottom in job log 62527afd Merge branch 'master' into 39109-reenable-scroll-job 0b5eda18 Improve naming and cache variables
* Merge branch 'github-rake-task-rate-limiting' into 'master'Douwe Maan2017-11-103-3/+36
| | | | | | | | | | Add GitHub enterprise support to the GitHub Rake task and better handle rate limiting being disabled See merge request gitlab-org/gitlab-ce!15284 (cherry picked from commit 760b2c75ef9d2c6acb655860dceae4c04cd8e5a7) 48cb1c50 Restore GH enterprise support in the Rake task f37fe2ed Support importing GH projects without rate limits
* Merge branch 'issue_39773_be' into 'master'Sean McGivern2017-11-103-11/+43
| | | | | | | | | | | Prevent fast forward merge when rebase is required Closes #39773 See merge request gitlab-org/gitlab-ce!15296 (cherry picked from commit f7537ce03a29b1af85461b2883c33bb41b2382d5) bddbb90f Prevent fast forward merge when rebase is required
* Merge branch '32059-fix-oauth-phishing' into 'master'Douwe Maan2017-11-106-7/+50
| | | | | | | | | | Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab-org/gitlab-ce!15311 (cherry picked from commit 8331786cfafd8c7c20daa154f0cc744a5ae5022f) ab1f3b47 Merge branch '32059-fix-oauth-phishing' into 'security-10-1' 24a3bee0 Add changelog entry for !2205
* Merge branch 'winh-installation-10-2-stable-docs' into 'master'Oswaldo Ferreira2017-11-101-2/+2
| | | | | | | | | Update installation.md to 10-2-stable See merge request gitlab-org/gitlab-ce!15315 (cherry picked from commit 3e763fdac57f9bc89b6446ae8d106f777baf23dd) 723a788d Update installation.md to 10-2-stable
* Merge branch 'winh-update-10-2-docs' into 'master'Oswaldo Ferreira2017-11-101-0/+360
| | | | | | | | | | Add Update guide for 10.2 See merge request gitlab-org/gitlab-ce!15316 (cherry picked from commit cfd8c605704dab0bfe649c38059dcc7a4d68e9db) b065a375 Add Update guide for 10.2 97056de8 Move markdown file to correct path
* Merge branch 'winh-templates-10-2' into 'master'Oswaldo Ferreira2017-11-103-3/+3
| | | | | | | | | Update templates for 10.2 See merge request gitlab-org/gitlab-ce!15317 (cherry picked from commit 913c0bf52226d952edee1cd43559fbb1e03dd338) a2bf79c9 Update templates for 10.2
* Merge branch 'winh-update-licenses-10-2' into 'master'Oswaldo Ferreira2017-11-101-23/+205
| | | | | | | | | Update licenses for 10.2 See merge request gitlab-org/gitlab-ce!15318 (cherry picked from commit 820c646cbba85b6a8696ad51c886f791f7ab4a3e) 874d876e Update licenses for 10.2
* Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master'Stan Hu2017-11-092-5/+6
| | | | | Add 10.1.2 security fixes to CHANGELOG on master See merge request gitlab-org/gitlab-ce!15305
* Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-094-10/+27
| | | | | | | | | Fail when issuable_meta_data is called on an unlimited collection Closes #39845 See merge request gitlab-org/gitlab-ce!15249 (cherry picked from commit 0c3877a48827b587b407174410196993bec79f73)
* Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan2017-11-093-28/+137
| | | | | | | | | Github enterprise support importer Closes #39931 See merge request gitlab-org/gitlab-ce!15281 (cherry picked from commit 1d7e2a961aec86e50f3159ad3b82524e86b007c2)
* Merge branch 'fix/doc/39935-missing-fields-in-merge-request-payload' into ↵Achilleas Pipinellis2017-11-091-0/+6
| | | | | | | | | | | 'master' Fix issue 39935 : Add created_at and updated_at fields in MR payload Closes #39935 See merge request gitlab-org/gitlab-ce!15274 (cherry picked from commit fec66bf7a163e14980f11d2f0370ce9c3630862b)
* Merge branch 'gitaly-700-wiki-update-page' into 'master'Douwe Maan2017-11-093-6/+46
| | | | | | | | | Migrate GitLab::Git::Wiki.update_page to Gitaly Closes gitaly#700 See merge request gitlab-org/gitlab-ce!15268 (cherry picked from commit ce06415cb6af38b5dab88d1babfe1888213a0684)
* Merge branch 'remove-ineffective-service-specs' into 'master'Filipa Lacerda2017-11-092-113/+0
| | | | | | | Remove ineffective Vue service specs See merge request gitlab-org/gitlab-ce!15277 (cherry picked from commit 14c0dc168a0e1fe2dfe67e6f9b20ff4adb431000)
* Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master'Rémy Coutable2017-11-095-28/+69
| | | | | | | | | Fix Error 500 when pushing LFS objects with a write deploy key Closes #39467 See merge request gitlab-org/gitlab-ce!15039 (cherry picked from commit 07ab4ad60a894d60ac561f9fdbd641fac90b4acc)
* Merge branch 'update-upload-documentation' into 'master'Nick Thomas2017-11-092-10/+59
| | | | | | | Added file storage documentation and updated hash storage one See merge request gitlab-org/gitlab-ce!15269 (cherry picked from commit 9e294180f29ec7ec9e9734a65b2b5d3124d657e4)
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-0911-29/+16
| | | | | | | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us Closes #34509 See merge request gitlab-org/gitlab-ce!15253 (cherry picked from commit bf13746fd8c7af1ef2e28e8a5a46cf0229b31eb8)
* Merge branch 'bvl-update-externalization-docs' into 'master'Achilleas Pipinellis2017-11-091-15/+12
| | | | | | | Make a note of which files to check in after externalizing strings See merge request gitlab-org/gitlab-ce!15207 (cherry picked from commit f6fb47854974dfa44443555e0e8371053fd73e45)
* Merge branch '38395-mr-widget-ci' into 'master'Phil Hughes2017-11-096-174/+204
| | | | | | | | | Resolve "Merge request widget - CI information has different margins" Closes #38395 See merge request gitlab-org/gitlab-ce!15237 (cherry picked from commit baa64d590bd66f73a7afbfccd301a8a14f10513b)
* Merge branch 'rc-fixup-mattermost-test-runner' into 'master'Grzegorz Bizon2017-11-091-2/+2
| | | | | | | Fix test selection in Test::Integration::Mattermost See merge request gitlab-org/gitlab-ce!15278 (cherry picked from commit 6f045671e665e42c7f354541e6804dda3c03438f)
* Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-09186-1294/+9142
| | | | | | | | | Rewrite the GitHub importer to perform work in parallel and greatly improve performance Closes #33135, #38621, and #39361 See merge request gitlab-org/gitlab-ce!14731 (cherry picked from commit 92249f1ac883c2a861235ec49526cbafca73b362)
* Merge branch 'jivl-add-missing-strings-tag-page' into 'master'Tim Zallmann2017-11-091-3/+3
| | | | | | | Added missing strings to prepare the tags page for internationalization See merge request gitlab-org/gitlab-ce!15256 (cherry picked from commit 3c369ba16e5c5a7d8a9f6187e08cb504c1ad91a6)
* Merge branch 'qa/gb/add-qa-internal-tests-to-the-pipeline' into 'master'Rémy Coutable2017-11-091-0/+10
| | | | | | | Add Internal QA specs to the pipeline See merge request gitlab-org/gitlab-ce!15240 (cherry picked from commit 133a2886b3d88bfdf7bb9e21e4e3d6727d516912)
* Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-096-16/+12
| | | | | | | | | Change Sign Out route from a DELETE to a GET Closes #39708 See merge request gitlab-org/gitlab-ce!15231 (cherry picked from commit b579cc7620dad1d406e974cce2d9ad5a4ce58a57)
* Merge branch 'fl-cleanup-test' into 'master'Tim Zallmann2017-11-081-23/+0
|\ | | | | | | | | Cleanup tests See merge request gitlab-org/gitlab-ce!15261
| * Update mr_widget_options_spec.jsfl-cleanup-testFilipa Lacerda2017-11-071-1/+0
| |
| * Cleanup testsFilipa Lacerda2017-11-071-22/+0
| |
* | Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan2017-11-083-1/+14
|\ \ | | | | | | | | | | | | | | | | | | When deleting merged branches, ignore protected tags Closes #39732 See merge request gitlab-org/gitlab-ce!15252
| * | When deleting merged branches, ignore protected tagstc-delete-merged-protected-tags-fixToon Claes2017-11-073-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ce!13251 wildcard Protected Branches were handled properly when deleting all merged branches. But this fix wasn't that good. It also checked branch names against Protected Tags. That's not correct. This change will **only** check if there is a Protected Branch matching the merged branch, and ignores Protected Tags. Closes gitlab-org/gitlab-ce#39732.
* | | Merge branch 'bvl-free-paths' into 'master'Douwe Maan2017-11-0810-111/+205
|\ \ \ | | | | | | | | | | | | | | | | Free some reserved group routes See merge request gitlab-org/gitlab-ce!15052
| * | | Remove EE-specific group pathsbvl-free-pathsBob Van Landuyt2017-11-072-19/+3
| | | |
| * | | Check redirecting with a querystringBob Van Landuyt2017-11-072-2/+14
| | | |
| * | | Update failure message when finding new routes in `PathRegex`Bob Van Landuyt2017-11-071-9/+4
| | | |
| * | | Free up some group reserved wordsBob Van Landuyt2017-11-077-61/+100
| | | |
| * | | Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt2017-11-075-73/+87
| | | |
| * | | Free up `labels` as a group nameBob Van Landuyt2017-11-073-5/+28
| | | |
| * | | Add helper methods to redirect legacy pathsBob Van Landuyt2017-11-073-0/+27
| | | |
* | | | Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into ↵Stan Hu2017-11-082-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Make BackgroundTransaction#labels public See merge request gitlab-org/gitlab-ce!15257
| * | | | Make BackgroundTransaction#labels publicPawel Chojnacki2017-11-072-2/+6
| | | | | | | | | | | | | | | | | | | | as are all other Transaction implementations
* | | | | Merge branch 'jivl-fix-karma-config-file' into 'master'Mike Greiling2017-11-081-9/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix karma config file See merge request gitlab-org/gitlab-ce!15263
| * | | | | fix karma config filejivl-fix-karma-config-fileJose Ivan Vargas2017-11-071-9/+0
| | | | | |
* | | | | | Merge branch 'ux-guide-components-modal' into 'master'Marcia Ramos2017-11-085-0/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modals in UX guide See merge request gitlab-org/gitlab-ce!14886
| * | | | | | Changed the order of buttons from left to rightux-guide-components-modalHazel2017-11-061-1/+2
| | | | | | |
| * | | | | | Modify the sentences and add TodoHazel2017-11-021-2/+4
| | | | | | |
| * | | | | | Modified the font family in the imagesHazel2017-10-186-1/+1
| | | | | | |
| * | | | | | Updated the sytle part - changed the order of header, body, and actionsHazel2017-10-171-3/+3
| | | | | | |