summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_32225_2' into 'master'fix-9-2-stable-conflicts-for-mr-11669Kamil Trzciński2017-06-125-0/+110
* Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11700' i...Timothy Andrew2017-06-123-2/+61
|\
| * Fix up merge_reqest_tabs import/require conflictsfix-9-2-stable-conflicts-for-mr-11700Eric Eastwood2017-06-122-12/+17
| * Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into '...Clement Ho2017-06-122-2/+56
* | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11964' i...Timothy Andrew2017-06-125-24/+48
|\ \
| * | Merge branch '32995-issue-contents-dynamically-replaced-with-stale-version-af...fix-9-2-stable-conflicts-for-mr-11964Adam Niedzielski2017-06-125-24/+48
| |/
* | Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-123-1/+14
|/
* Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-06-124-2/+49
* Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-06-122-1/+33
* Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'Douwe Maan2017-06-125-15/+27
* Merge branch 'fix/backup-restore-resume' into 'master'James Lopez2017-06-123-38/+104
* Merge branch '33377-fix-null-ref-in-repo-is-ancestor' into 'master'Douwe Maan2017-06-122-8/+34
* Merge branch 'fix-9-2-stable-conflicts-for-mr-11702' into '9-2-stable'Annabel Dunstone Gray2017-06-092-3/+8
|\
| * 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 remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11793' i...Timothy Andrew2017-06-082-1/+5
|\ \
| * | Fix conflict in app/assets/javascripts/blob/viewer/index.jsfix-9-2-stable-conflicts-for-mr-11793Sean McGivern2017-06-081-40/+1
| * | Merge branch '33048-markdown-rendering-of-md-files-has-ceased-to-display-late...Douwe Maan2017-06-082-0/+43
* | | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-06-082-1/+14
* | | Merge branch 'feature/gb/qa/switch-to-headless-chrome-via-selenium-webdriver'...Rémy Coutable2017-06-085-23/+48
* | | Merge branch '32850-award-emoji-off' into 'master'Phil Hughes2017-06-081-2/+3
* | | Merge branch 'add-back-margin-to-note-text' into 'master'Annabel Dunstone Gray2017-06-081-6/+0
* | | Merge branch 'zj-drop-fk-if-exists' into 'master'Yorick Peterse2017-06-082-1/+15
* | | Merge branch 'issue-title-fade-fix' into '9-2-stable'Filipa Lacerda2017-06-081-1/+1
* | | Merge branch '32977-user-autocomplete-per_page-does-not-work' into 'master'Douwe Maan2017-06-082-1/+15
* | | Merge branch 'winh-merge-request-tree-symbols' into 'master'Annabel Dunstone Gray2017-06-081-6/+2
* | | Merge branch 'sh-fix-lfs-from-moving-across-filesystems' into 'master'Kamil Trzciński2017-06-083-0/+51
* | | Merge branch '31556-ci-coverage-paralel-rspec' into 'master'Kamil Trzciński2017-06-083-24/+74
* | | Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-06-0811-12/+102
* | | Merge branch 'fix/gb/use-merge-ability-for-protected-manual-actions' into 'ma...Kamil Trzciński2017-06-0816-41/+104
* | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-06-085-15/+47
* | | Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into 'mas...Kamil Trzciński2017-06-082-2/+3
* | | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-06-083-3/+23
* | | Merge branch 'fix-emoji-menu-z-index' into 'master'Annabel Dunstone Gray2017-06-081-1/+1
| |/ |/|
* | 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
| |/