summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'focus-mode-board'focus-mode-boardDimitrie Hoekstra2017-03-17703-7053/+13742
|\
| * Merge branch 'fix-time-sensitive-helper-spec' into 'master' Robert Speicher2017-03-171-6/+10
| |\
| | * Fix time-sensitive helper specRémy Coutable2017-03-171-6/+10
| * | Merge branch '29557-fix-unicode-1-1' into 'master' Clement Ho2017-03-171-0/+1
| |\ \
| | * | Fix Unicode 1.1 emojis29557-fix-unicode-1-1Eric Eastwood2017-03-161-0/+1
| * | | Merge branch '20121-add-a-new-have_html_escaped_body_text-matcher' into 'mast...Robert Speicher2017-03-172-31/+37
| |\ \ \
| | * | | Add a new have_html_escaped_body_text that match an HTML-escaped text20121-add-a-new-have_html_escaped_body_text-matcherRémy Coutable2017-03-172-31/+37
| * | | | Merge branch 'build-notification-null-check' into 'master' Jacob Schatz2017-03-171-1/+1
| |\ \ \ \
| | * | | | Stop CI notification showing when status is nilbuild-notification-null-checkPhil Hughes2017-03-171-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'update-realtime-docs' into 'master' Jacob Schatz2017-03-171-7/+14
| |\ \ \ \
| | * | | | Updates realtime documentation for the FrontendFilipa Lacerda2017-03-171-7/+14
| |/ / / /
| * | | | Merge branch 'docs/award_emojis' into 'master' Sean Packham (GitLab)2017-03-1710-65/+52
| |\ \ \ \
| | * | | | Refactor award emojis documentdocs/award_emojisAchilleas Pipinellis2017-03-1710-65/+52
| | |/ / /
| * | | | Merge branch 'boards-blank-state-template-in-js' into 'master' Filipa Lacerda2017-03-175-62/+172
| |\ \ \ \
| | * | | | Fixed eslintboards-blank-state-template-in-jsPhil Hughes2017-03-162-6/+8
| | * | | | Catches errors when generating listsPhil Hughes2017-03-162-0/+99
| | * | | | Issue boards blank state template in JS filePhil Hughes2017-03-154-62/+71
| * | | | | Merge branch '29577-restore-sub-nav-with-activity-tab' into 'master' Rémy Coutable2017-03-171-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Restore sub-nav for empty project29577-restore-sub-nav-with-activity-tabEric Eastwood2017-03-161-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'add-labels-to-issue-hook' into 'master' Sean McGivern2017-03-175-1/+32
| |\ \ \ \
| | * | | | Added labels to the issue web hookLuke "Jared" Bennett2017-03-175-1/+32
| * | | | | Merge branch '29604-v3-fix-branch-creation' into 'master' Sean McGivern2017-03-173-0/+77
| |\ \ \ \ \
| | * | | | | Use "branch_name" instead "branch" on V3 branch creation API29604-v3-fix-branch-creationOswaldo Ferreira2017-03-163-0/+77
| * | | | | | Merge branch '21451-allow-disable-mr-link' into 'master' Sean McGivern2017-03-179-1/+73
| |\ \ \ \ \ \
| | * | | | | | Add ability to disable Merge Request URL on pushAlex Sanford2017-03-179-1/+73
| |/ / / / / /
| * | | | | | Merge branch '26470-branch-names-with-reference-prefixes-results-in-buggy-bra...Sean McGivern2017-03-173-0/+12
| |\ \ \ \ \ \
| | * | | | | | Strip reference prefixes on branch creationMatthieu Tardy2017-01-093-0/+12
| * | | | | | | Add a documentation blurb to the new issue template to encourage writing (bet...Job van der Voort2017-03-171-0/+10
| |\ \ \ \ \ \ \
| | * | | | | | | documentation blurb in issue templateJob van der Voort2017-03-171-0/+10
| |/ / / / / / /
| * | | | | | | Merge branch 'fix-make-email-static' into 'master' Rémy Coutable2017-03-171-1/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Make sure alias email would never match:Lin Jen-Shin2017-03-171-1/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'fix-make-time-test-more-reliable' into 'master' Rémy Coutable2017-03-171-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Make the test less time sensitive by extending 0.2fix-make-time-test-more-reliableLin Jen-Shin2017-03-171-2/+2
| |/ / / / /
| * | | | | Merge branch 'fix-unknown-emojis-in-frequently-used-awards' into 'master' Alfredo Sumaran2017-03-175-9/+89
| |\ \ \ \ \
| | * | | | | Protect against unknown emojis in frequently used listfix-unknown-emojis-in-frequently-used-awardsEric Eastwood2017-03-165-9/+89
| * | | | | | Merge branch 'dm-use-index-by' into 'master' Robert Speicher2017-03-175-20/+5
| |\ \ \ \ \ \
| | * | | | | | Use Enumerable#index_by where possibledm-use-index-byDouwe Maan2017-03-165-20/+5
| * | | | | | | Merge branch 'fix-double-click-token-name' into 'master' Alfredo Sumaran2017-03-171-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Fix double click token namefix-double-click-token-nameClement Ho2017-03-161-1/+1
| * | | | | | | Merge branch 'fix-slow-queries-for-branches-index' into 'master' Douwe Maan2017-03-1610-6/+56
| |\ \ \ \ \ \ \
| | * | | | | | | removes n+1 query from tags and branches indexesfix-slow-queries-for-branches-indexTiago Botelho2017-03-1610-6/+56
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'zj-fix-slack-link' into 'master' Rémy Coutable2017-03-162-6/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Fix Slack link when on notifyZeger-Jan van de Weg2017-03-162-6/+5
| |/ / / / / / /
| * | | | | | | Merge branch 'add-blob-copy-button' into 'master' Robert Speicher2017-03-1613-75/+102
| |\ \ \ \ \ \ \
| | * | | | | | | Fix specadd-blob-copy-buttonDouwe Maan2017-03-162-3/+3
| | * | | | | | | Use code icon for RawDouwe Maan2017-03-161-1/+1
| | * | | | | | | Fix specDouwe Maan2017-03-1612-76/+97
| | * | | | | | | Add copy button to blob header and use icon for Raw buttonDouwe Maan2017-03-162-4/+10
| * | | | | | | | Merge branch 'fix-jasmine-describe' into 'master' Alfredo Sumaran2017-03-161-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | fix describe block to make the karma reporter happyMike Greiling2017-03-161-1/+1