summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Improve conflict message in _merge_params.html.hamlLuke "Jared" Bennett2017-06-141-1/+2
* Port _merge_params.html.haml conflict messagepatch-23Luke "Jared" Bennett2017-06-131-1/+1
* Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11706' i...Timothy Andrew2017-06-132-6/+12
|\
| * Fix merge conflicts on pipeline schedulesfix-9-2-stable-conflicts-for-mr-11706Z.J. van de Weg2017-06-132-10/+2
| * Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-06-132-3/+17
* | Merge branch '9-2-stable' into fix-9-2-stable-conflicts-for-mr-11744Clement Ho2017-06-1240-103/+206
|\ \ | |/
| * Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11700' i...Timothy Andrew2017-06-121-1/+1
| |\
| | * Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into '...Clement Ho2017-06-121-1/+1
| * | Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-121-1/+9
| |/
| * Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-06-122-2/+17
| * Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-06-121-1/+1
| * Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'Douwe Maan2017-06-121-9/+15
| * Merge branch '33377-fix-null-ref-in-repo-is-ancestor' into 'master'Douwe Maan2017-06-121-0/+2
| * 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-081-1/+1
| |\ \
| | * | 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-081-0/+39
| * | | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-06-081-1/+4
| * | | 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 '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-081-1/+1
| * | | 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-081-0/+16
| * | | Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-06-084-3/+18
| * | | Merge branch 'fix/gb/use-merge-ability-for-protected-manual-actions' into 'ma...Kamil Trzciński2017-06-083-2/+3
| * | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-06-081-12/+12
| * | | Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into 'mas...Kamil Trzciński2017-06-081-1/+1
| * | | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-06-082-3/+6
| * | | 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-086-43/+60
| * | Merge branch '32954-loading-icon' into 'master'Phil Hughes2017-06-082-0/+8
| * | Merge branch 'fix_counter_cache_invalidation' into 'master'Douwe Maan2017-06-086-2/+7
* | | Fix conflictsClement Ho2017-06-081-256/+32
* | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' i...Phil Hughes2017-06-085-5/+268
|/ /
* | Merge branch 'sh-fix-submodules-trailing-spaces' into 'master'Robert Speicher2017-06-081-0/+1
* | Merge branch 'fix_duplicated_assignees_on_milestone_page' into 'master'Sean McGivern2017-06-081-1/+1
* | 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-072-1/+15
|\ \ | |/
| * Optimize query for User#groups_through_project_authorizationstc-fix-group-finder-subgrouping-9-2Toon Claes2017-05-311-9/+8
| * All ancestor groups should be returned by GroupsFinderToon Claes2017-05-312-1/+13
| * GroupsFinder should also returns groups of authorized projectsToon Claes2017-05-301-1/+4
| * Show private subgroups if member of parent groupToon Claes2017-05-291-1/+1
* | Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-021-0/+5