summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prefix EmailsOnPush email subject with `[Git]`.emailsonpush-prefixDouwe Maan2015-05-252-1/+3
* Merge branch 'fix-redundant-changelog-entry' into 'master'Robert Schilling2015-05-251-1/+0
|\
| * This entry was already present in v7.10.4Stan Hu2015-05-221-1/+0
* | Merge branch 'add-webhook-note-events' into 'master'Douwe Maan2015-05-2517-6/+317
|\ \
| * | Add support for Webhook note eventsStan Hu2015-05-2117-6/+317
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cePatricio Cano2015-05-226-6/+35
|\ \ \
| * \ \ Merge branch 'fix-merge-request-assignee-list' into 'master'Douwe Maan2015-05-226-6/+35
| |\ \ \
| | * | | Use the user list from the target project in a merge requestStan Hu2015-05-226-5/+34
| | |/ /
* | | | Added 7.11.2 to CHANGELOGPatricio Cano2015-05-221-0/+3
* | | | EE can be accessed without a subscriptionSytse Sijbrandij2015-05-221-1/+1
|/ / /
* | | update CHANGELOG with release 7.11.1Job van der Voort2015-05-221-2/+5
* | | notify the core team and devsJob van der Voort2015-05-221-1/+4
| |/ |/|
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-229-7/+16
|\ \ | |/
| * Merge branch 'fix-atom-feeds' into 'master'Douwe Maan2015-05-217-7/+7
| |\
| | * Fix Atom feeds.Douwe Maan2015-05-217-7/+7
| |/
| * Merge branch 'rs-issue-1568' into 'master'Douwe Maan2015-05-212-0/+9
| |\
| | * Workaround that doesn't add unwanted newline.Douwe Maan2015-05-212-4/+6
| | * Work around a Chrome 43 bug preventing note editingrs-issue-1568Robert Speicher2015-05-201-0/+7
* | | Merge branch 'timezones' into 'master'Job van der Voort2015-05-222-1/+20
|\ \ \ | |/ / |/| |
| * | Link to change your time zone in Gitlab CEKaren Carias2015-05-211-1/+2
| * | Added instructions to change time zone in GitLab CEKaren Carias2015-05-211-0/+18
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJob van der Voort2015-05-2112-32/+94
|\ \
| * \ Merge branch 'fix-v7.10.4-changelog' into 'master'Hannes Rosenögger2015-05-211-4/+9
| |\ \
| | * | Update CHANGELOG with v7.10.4 changesStan Hu2015-05-151-4/+9
| * | | Merge branch 'rs-issue-1651' into 'master'Dmitriy Zaporozhets2015-05-211-13/+22
| |\ \ \
| | * | | Customize the sanitization whitelist only oncers-issue-1651Robert Speicher2015-05-201-13/+22
| |/ / /
| * | | Merge branch 'rs-issue-1645' into 'master'Dmitriy Zaporozhets2015-05-206-8/+45
| |\ \ \
| | * | | Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-206-8/+45
| | | |/ | | |/|
| * | | Merge branch 'lexer_error_workaround' into 'master'Douwe Maan2015-05-202-2/+5
| |\ \ \ | | |/ / | |/| |
| | * | workaround for buggy lexersHannes Rosenögger2015-05-202-2/+5
| |/ /
| * | Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets2015-05-203-5/+13
| |\ \
| | * | Remove italics and margin from merge request form help.Douwe Maan2015-05-201-1/+1
| | * | Fix copy.explain-wip-mrDouwe Maan2015-05-171-1/+1
| | * | Add explanation about WIP status to MR form.Douwe Maan2015-05-153-5/+13
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJob van der Voort2015-05-218-16/+31
|\ \ \ \
| * \ \ \ Merge pull request #9316 from jvanbaarsen/gitlab-git-updateDouwe Maan2015-05-212-5/+5
| |\ \ \ \
| | * | | | Updated the gitlab_git gemJeroen van Baarsen2015-05-212-5/+5
| | |/ / /
| * | | | Merge pull request #9317 from jvanbaarsen/move-changelog-stuffJeroen van Baarsen2015-05-211-3/+3
| |\ \ \ \
| | * | | | Moved changelog stuff to the correct releaseJeroen van Baarsen2015-05-211-3/+3
| |/ / / /
| * | | | Merge pull request #9278 from jvanbaarsen/pr/8755Jeroen van Baarsen2015-05-216-8/+23
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Disabled expansion of top/bottom blobs for new file diffsAlex Connor2015-05-216-8/+23
| |/ / /
* | | | Small css improvementsDmitriy Zaporozhets2015-05-193-2/+7
|/ / /
* | | Merge branch 'jirutka-shell-secret-path'Marin Jankovski2015-05-196-6/+14
|\ \ \
| * | | Move the changelog item to 7.12Marin Jankovski2015-05-191-1/+3
| * | | Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ...Marin Jankovski2015-05-196-6/+12
| |\ \ \ |/ / / /
| * | | Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-166-6/+12
* | | | Merge pull request #9289 from jirutka/asciidoc-2Robert Speicher2015-05-1810-49/+35
|\ \ \ \
| * | | | Simplify and unify helpers for rendering markupJakub Jirutka2015-05-188-34/+20
| * | | | Rename MarkdownHelper to MarkupHelperJakub Jirutka2015-05-185-15/+15
|/ / / /
* | | | Merge pull request #9288 from jirutka/asciidocRobert Speicher2015-05-1812-9/+189
|\ \ \ \