summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix conflicts in notes.scssfix-9-2-stable-conflicts-for-mr-11702Eric Eastwood2017-06-081-7/+0
* Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'ma...Annabel Dunstone Gray2017-06-082-3/+15
* Merge branch '32683-resolved-discussions-icon-is-misaligned' into 'master'Annabel Dunstone Gray2017-06-081-1/+9
* Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gon...Fatih Acet2017-06-088-43/+100
* Merge branch '32954-loading-icon' into 'master'Phil Hughes2017-06-082-0/+8
* Merge branch 'fix_counter_cache_invalidation' into 'master'Douwe Maan2017-06-0812-2/+46
* Merge branch 'sh-fix-submodules-trailing-spaces' into 'master'Robert Speicher2017-06-083-0/+10
* Merge branch 'fix_duplicated_assignees_on_milestone_page' into 'master'Sean McGivern2017-06-082-1/+14
* Merge branch '30502-fix-bottom-padding-job-page' into 'master'Annabel Dunstone Gray2017-06-081-0/+4
* Merge branch 'winh-filter-dropdown-spinner' into 'master'Annabel Dunstone Gray2017-06-081-0/+1
* Merge branch '33265-fix-9-2-stable-issue-description-flash-newlines' into '9-...Phil Hughes2017-06-083-5/+9
|\
| * Fix description flash with newline differences (HTML entities)33265-fix-9-2-stable-issue-description-flash-newlinesEric Eastwood2017-06-063-5/+9
* | Merge remote-tracking branch 'gitlab/9-2-stable' into 9-2-stableRegis2017-06-075-7/+68
|\ \ | |/
| * Merge branch 'tc-fix-group-finder-subgrouping-9-2' into '9-2-stable'Douwe Maan2017-05-315-7/+68
| |\
| | * Optimize query for User#groups_through_project_authorizationstc-fix-group-finder-subgrouping-9-2Toon Claes2017-05-312-10/+9
| | * All ancestor groups should be returned by GroupsFinderToon Claes2017-05-315-5/+39
| | * GroupsFinder should also returns groups of authorized projectsToon Claes2017-05-302-1/+13
| | * Show private subgroups if member of parent groupToon Claes2017-05-292-3/+19
| |/
* | Update VERSION to 9.2.5v9.2.5Regis2017-06-071-1/+1
* | Update CHANGELOG.md for 9.2.5Regis2017-06-071-0/+4
* | Merge branch 'bvl-fix-typo-renaming-appearance' into 'security-9-2'Douwe Maan2017-06-073-2/+59
* | Update VERSION to 9.2.4v9.2.4Regis2017-06-021-1/+1
* | Update CHANGELOG.md for 9.2.4Regis2017-06-022-4/+4
* | Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-0214-18/+210
* | Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'Sean McGivern2017-06-023-2/+13
* | Update VERSION to 9.2.3v9.2.3Regis2017-05-311-1/+1
* | Update CHANGELOG.md for 9.2.3Regis2017-05-315-16/+7
* | Fix incorrect merge in 2c6fc0f.Timothy Andrew2017-05-311-0/+1
* | Merge branch 'bvl-security-9-2-28917-contain-uploads-in-system-dir' into 'sec...Douwe Maan2017-05-3133-30/+916
* | Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher2017-05-312-0/+5
* | Merge branch 'dz-restrict-autocomplete' into 'security-9-1' Robert Speicher2017-05-313-11/+25
* | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'Timothy Andrew2017-05-313-2/+45
* | Revert "Merge branch 'issue-title-fade-fix' into '9-2-stable'"Timothy Andrew2017-05-301-1/+1
|/
* Merge branch 'issue-title-fade-fix' into '9-2-stable'Filipa Lacerda2017-05-261-1/+1
|\
| * Replace nextTick with setTimeoutPhil Hughes2017-05-261-1/+1
|/
* Update VERSION to 9.2.2v9.2.2Regis2017-05-251-1/+1
* Update CHANGELOG.md for 9.2.2Regis2017-05-253-8/+5
* Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-255-1/+26
* Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-2516-434/+635
* Merge branch '32715-fix-note-padding' into 'master'Annabel Dunstone Gray2017-05-253-5/+13
* Merge branch '32828-refresh-build' into 'master'Phil Hughes2017-05-251-1/+1
* Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-245-32/+37
* Merge branch 'fix-notify-post-receive' into 'master'Stan Hu2017-05-243-89/+91
* Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-249-1/+104
* Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'Annabel Dunstone Gray2017-05-241-0/+4
* Merge branch 'acet-fix-mr-widget-state' into 'master'Douwe Maan2017-05-242-10/+10
* Update VERSION to 9.2.1v9.2.1Clement Ho2017-05-231-1/+1
* Update CHANGELOG.md for 9.2.1Clement Ho2017-05-233-8/+5
* Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-2312-28/+27
* Merge branch 'fix/gb/remove-ci-models-from-eager-load-paths' into 'master' Rémy Coutable2017-05-231-1/+0