summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '22782-external-link-filter-with-non-lowercase-scheme' into 'mas...Sean McGivern2016-10-181-4/+30
|\
| * Add Nofollow for uppercased scheme in external urlthe-undefined2016-10-181-4/+30
* | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-183-0/+49
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-186-13/+93
| |\ \ | | |/
| * | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-172-11/+10
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1422-254/+517
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0843-264/+628
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0436-393/+309
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2129-151/+619
| |\ \ \ \ \ \
| * | | | | | | Make various trace methods take last_lines argument:Lin Jen-Shin2016-09-211-0/+49
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-198-27/+35
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1415-41/+114
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1268-420/+904
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | We don't need themLin Jen-Shin2016-09-012-0/+0
* | | | | | | | | | | Merge branch 'zj-grapify-commits' into 'master' Rémy Coutable2016-10-181-60/+69
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use GrapeDSL for commitsZ.J. van de Weg2016-10-181-60/+69
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' Sean McGivern2016-10-182-5/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversionAdam Niedzielski2016-10-172-5/+9
* | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-172-1/+18
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add RTL support to markdown rendererEbrahim Byagowi2016-10-162-1/+18
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-176-101/+105
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Improve ExtractsPath logic related to atom formatdz-fix-extract-pathDmitriy Zaporozhets2016-10-151-8/+9
| * | | | | | | | | Use module_function in Banzai::Rendererfix-banzai-renderer-instrumentationYorick Peterse2016-10-141-3/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'grapify-boards-api' into 'master' Rémy Coutable2016-10-141-31/+45
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Grapify boards APIRobert Schilling2016-10-141-31/+45
| * | | | | | | | | Merge branch 'fix/reassign-secret-token-on-generate' into 'master' Douwe Maan2016-10-141-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Reassign secret token when regenerating onefix/reassign-secret-token-on-generateGrzegorz Bizon2016-10-131-2/+2
| * | | | | | | | | | Merge branch 'grapify-todos-api' into 'master' Rémy Coutable2016-10-141-26/+19
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Grapify todos APIgrapify-todos-apiRobert Schilling2016-10-141-26/+19
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'grapify-system-hooks' into 'master' Rémy Coutable2016-10-141-31/+29
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Grapify system hooks APIgrapify-system-hooksRobert Schilling2016-10-131-31/+29
| | |/ / / / / / / / /
* | | | | | | | | | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+5
* | | | | | | | | | | Simplify conflict file JSON creationSean McGivern2016-10-131-7/+15
* | | | | | | | | | | Allow setting content for resolutionsSean McGivern2016-10-134-13/+63
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ce-to-ee-merge-check-rake-task' into 'master' Robert Speicher2016-10-132-0/+111
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve the branch existence and merge checksce-to-ee-merge-check-rake-taskRémy Coutable2016-10-132-14/+23
| * | | | | | | | | | Draft a quick CE->EE merge check rake taskRémy Coutable2016-10-132-0/+102
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'api-order-mounts' into 'master' Rémy Coutable2016-10-131-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sort API mountsapi-order-mountsRobert Schilling2016-10-131-4/+4
* | | | | | | | | | | Merge branch '22591-Convert-UTF-8-Emoji-to-Gitlab-emoji' into 'master' Rémy Coutable2016-10-132-7/+56
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-132-20/+26
| * | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-126-85/+157
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-111-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Convert unicode emojis to images.henrik2016-10-112-9/+52
* | | | | | | | | | | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-131-14/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update Issue Board API to handle with has_many associationDouglas Barbosa Alexandre2016-10-111-14/+17
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'zj-grapedsl-variable' into 'master' Rémy Coutable2016-10-131-47/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | GrapeDSL for variableszj-grapedsl-variableZ.J. van de Weg2016-10-131-47/+42
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'api-version' into 'master' Robert Speicher2016-10-122-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | API: Version informationapi-versionRobert Schilling2016-10-122-0/+13
| | |_|/ / / / / / / / | |/| | | | | | | | |