Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'issue_25887' into 'master' | Douglas Barbosa Alexandre | 2016-12-23 | 5 | -9/+15 |
|\ | |||||
| * | Fix rubucop offenses | Douglas Barbosa Alexandre | 2016-12-23 | 1 | -2/+2 |
| * | Rename `opt` to `opts` on ChatNotificationService#executeissue_25887 | Douglas Barbosa Alexandre | 2016-12-23 | 1 | -4/+4 |
| * | Do not override incoming webhook channel for mattermost and slack | Felipe Artur | 2016-12-22 | 5 | -7/+13 |
* | | Merge branch 'permit-uploadedfile-scalar' into 'master' | Rémy Coutable | 2016-12-23 | 1 | -0/+16 |
|\ \ | |||||
| * | | Monkey-patch StrongParameters for ::UploadedFile | Jacob Vosmaer | 2016-12-23 | 1 | -0/+16 |
* | | | Merge branch '25614-transient-failure' into 'master' | Rémy Coutable | 2016-12-23 | 1 | -6/+8 |
|\ \ \ | |||||
| * | | | Improve spec for resetting incoming email token | Adam Niedzielski | 2016-12-23 | 1 | -6/+8 |
* | | | | Merge branch 'process-commit-worker-large-batches' into 'master' | Douwe Maan | 2016-12-23 | 3 | -11/+36 |
|\ \ \ \ | |||||
| * | | | | Schedule at most 100 commitsprocess-commit-worker-large-batches | Yorick Peterse | 2016-12-23 | 3 | -11/+36 |
* | | | | | Merge branch 'zj-fix-issue-search-chat-command' into 'master' | Rémy Coutable | 2016-12-23 | 4 | -9/+34 |
|\ \ \ \ \ | |||||
| * | | | | | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-command | Z.J. van de Weg | 2016-12-23 | 4 | -9/+34 |
* | | | | | | Merge branch 'fix/changelog' into 'master' | Douglas Barbosa Alexandre | 2016-12-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | [ci skip] Fix wrong release date for 8.15.0 on CHANGELOG | Douglas Barbosa Alexandre | 2016-12-23 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'fix-latest-pipeine-ordering' into 'master' | Grzegorz Bizon | 2016-12-23 | 4 | -14/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Update the description because it's more broaderfix-latest-pipeine-ordering | Lin Jen-Shin | 2016-12-23 | 1 | -1/+1 |
| * | | | | | Update description stating that ordering is important | Lin Jen-Shin | 2016-12-23 | 1 | -2/+2 |
| * | | | | | Prefer oneline and Rubocop prefers ternary operator | Lin Jen-Shin | 2016-12-23 | 1 | -7/+2 |
| * | | | | | Ci::Pipeline.latest order by id DESC | Lin Jen-Shin | 2016-12-23 | 4 | -14/+18 |
| |/ / / / | |||||
* | | | | | Merge branch 'zj-mattermost-config-username' into 'master' | Kamil Trzciński | 2016-12-23 | 0 | -0/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Post username as property, not user_namezj-mattermost-config-username | Z.J. van de Weg | 2016-12-22 | 2 | -2/+2 |
* | | | | | Merge branch 'fixes-issues-api-reopen' into 'master' | Rémy Coutable | 2016-12-23 | 2 | -2/+8 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix state_event parameter to reopen an issuefixes-issues-api-reopen | Robert Schilling | 2016-12-22 | 2 | -2/+8 |
* | | | | | Merge branch 'docs/add_imgs_to_mr_resolution_issue' into 'master' 26002-pipeline-stage-icons | Achilleas Pipinellis | 2016-12-22 | 3 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Add images to issue creation from unresolved discussions | Achilleas Pipinellis | 2016-12-22 | 3 | -2/+6 |
* | | | | | | Merge branch 'patch-9' into 'master' | Achilleas Pipinellis | 2016-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update test-and-deploy-ruby-application-to-heroku.md | William | 2016-12-21 | 1 | -1/+1 |
* | | | | | | | Merge branch '25941-odd-overflow-behavior-for-long-issue-headers' into 'master' | Alfredo Sumaran | 2016-12-22 | 2 | -2/+6 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Change earlier to task_status_short to avoid titlebar line wraps25941-odd-overflow-behavior-for-long-issue-headers | dimitrieh | 2016-12-22 | 2 | -2/+6 |
* | | | | | | | Merge branch 'markdown-input-symbol-regex' into 'master' | Jacob Schatz | 2016-12-22 | 2 | -3/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added tests for special charactersmarkdown-input-symbol-regex | Phil Hughes | 2016-12-22 | 1 | -0/+18 |
| * | | | | | | | Stops GFM special characters interfering with markdown tags | Phil Hughes | 2016-12-22 | 1 | -3/+4 |
* | | | | | | | | Merge branch 'pc-add-gitaly-to-architecture' into 'master' | Sid Sijbrandij | 2016-12-22 | 3 | -5/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update architecture diagram | Pablo Carranza | 2016-12-22 | 1 | -0/+0 |
| * | | | | | | | | Add changelog entrypc-add-gitaly-to-architecture | Pablo Carranza | 2016-12-22 | 1 | -0/+4 |
| * | | | | | | | | Add Gitaly to the architecture of the application | Pablo Carranza | 2016-12-22 | 2 | -5/+9 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'zj-slack-docs' into 'master' | Sean Packham | 2016-12-22 | 3 | -0/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | List all commands | Z.J. van de Weg | 2016-12-22 | 2 | -2/+17 |
| * | | | | | | | | Slack docs [ci skip] | Z.J. van de Weg | 2016-12-22 | 2 | -0/+22 |
* | | | | | | | | | Merge branch '25951-labels-are-not-consistent-on-all-pages' into 'master' | Fatih Acet | 2016-12-22 | 1 | -6/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Removed color-label overwrites25951-labels-are-not-consistent-on-all-pages | Luke "Jared" Bennett | 2016-12-22 | 1 | -6/+0 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'increase-left-padding-of-filter-row-labels' into 'master' | Fatih Acet | 2016-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Increase left padding of filter row labelsincrease-left-padding-of-filter-row-labels | Luke "Jared" Bennett | 2016-12-22 | 1 | -1/+1 |
* | | | | | | | | | Update VERSION to 8.16.0-prev8.16.0.pre | Douglas Barbosa Alexandre | 2016-12-22 | 1 | -1/+1 |
* | | | | | | | | | Update CHANGELOG.md for 8.15.0 | Douglas Barbosa Alexandre | 2016-12-22 | 198 | -797/+207 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch '25979-fix-todos-on-failed-build' into 'master' | Robert Speicher | 2016-12-22 | 3 | -1/+21 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix viewing "build failed" TODOs | Nick Thomas | 2016-12-22 | 3 | -1/+21 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'zj-mattermost-auto-config-docs' into 'master' | Sean Packham | 2016-12-22 | 1 | -2/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Docs on MM auto configzj-mattermost-auto-config-docs | Z.J. van de Weg | 2016-12-21 | 1 | -2/+8 |
* | | | | | | | | Merge branch 'zj-slack-404-error' into 'master' | Kamil Trzciński | 2016-12-22 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ |