summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix a Grape deprecation, use `#request_method` instead of `#route_method`fix-api-deprecationRémy Coutable2016-12-233-3/+7
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'process-commit-worker-large-batches' into 'master' Douwe Maan2016-12-233-11/+36
|\ | | | | | | | | | | | | Improve ProcessCommitWorker for large push payloads Closes #25827 See merge request !8267
| * Schedule at most 100 commitsprocess-commit-worker-large-batchesYorick Peterse2016-12-233-11/+36
| | | | | | | | | | | | | | | | | | When processing push payloads we now schedule at most the 100 most recent commits, instead of all commits that were in a payload. This prevents one from overloading the system by pushing thousands if not millions of commits in a single go. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25827
* | Merge branch 'zj-fix-issue-search-chat-command' into 'master' Rémy Coutable2016-12-234-9/+34
|\ \ | | | | | | | | | | | | | | | | | | Fix errorcode 500 on slash commands Closes #26013 See merge request !8285
| * | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-commandZ.J. van de Weg2016-12-234-9/+34
| | | | | | | | | | | | Coverage was failing, so this could slip through the cracks
* | | Merge branch 'fix/changelog' into 'master' Douglas Barbosa Alexandre2016-12-231-1/+1
|\ \ \ | |_|/ |/| | | | | | | | [ci skip] Fix wrong release date for 8.15.0 on CHANGELOG See merge request !8294
| * | [ci skip] Fix wrong release date for 8.15.0 on CHANGELOGDouglas Barbosa Alexandre2016-12-231-1/+1
|/ /
* | Merge branch 'fix-latest-pipeine-ordering' into 'master' Grzegorz Bizon2016-12-234-14/+13
|\ \ | | | | | | | | | | | | | | | | | | Fix code that selects latest pipelines Closes #25993 and #26031 See merge request !8286
| * | Update the description because it's more broaderfix-latest-pipeine-orderingLin Jen-Shin2016-12-231-1/+1
| | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8286/diffs#note_20435082
| * | Update description stating that ordering is importantLin Jen-Shin2016-12-231-2/+2
| | | | | | | | | | | | Feedback from Grzegorz
| * | Prefer oneline and Rubocop prefers ternary operatorLin Jen-Shin2016-12-231-7/+2
| | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8286/diffs#note_20433402
| * | Ci::Pipeline.latest order by id DESCLin Jen-Shin2016-12-234-14/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name latest implies that it's reverse chronological, and we did expect it that way. https://gitlab.com/gitlab-org/gitlab-ce/issues/25993#note_20429761 >>> ok, I think markglenfletchera is correct in https://gitlab.com/gitlab-com/support-forum/issues/1394#note_20399939 that `Project#latest_successful_builds_for` is giving oldest pipeline rather than latest pipeline. This is a ~regression introduced by !7333 where `order(id: :desc)` was removed causing this. The offending change was: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333/diffs#b22732e5f39e176c7c719fe485847d0fb0564275_92_108 The confusion was caused by the `latest` name implication, which actually didn't order anything, and I think we should add `order(id: :desc)` to `Ci::Pipeline.latest` otherwise it's confusing that it's not actually ordered. >>> Closes #25993
* | Merge branch 'zj-mattermost-config-username' into 'master' Kamil Trzciński2016-12-230-0/+0
|\ \ | | | | | | | | | | | | Post username as property, not user_name See merge request !8261
| * | Post username as property, not user_namezj-mattermost-config-usernameZ.J. van de Weg2016-12-222-2/+2
| | |
* | | Merge branch 'fixes-issues-api-reopen' into 'master' Rémy Coutable2016-12-232-2/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix state_event parameter to reopen an issue Closes #25958 See merge request !8246
| * | Fix state_event parameter to reopen an issuefixes-issues-api-reopenRobert Schilling2016-12-222-2/+8
| | |
* | | Merge branch 'docs/add_imgs_to_mr_resolution_issue' into 'master' 26002-pipeline-stage-iconsAchilleas Pipinellis2016-12-223-2/+6
|\ \ \ | | | | | | | | | | | | | | | | Add more images to issue creation from unresolved discussions See merge request !8279
| * | | Add images to issue creation from unresolved discussionsAchilleas Pipinellis2016-12-223-2/+6
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'patch-9' into 'master' Achilleas Pipinellis2016-12-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed typo in test-and-deploy-ruby-application-to-heroku.md See merge request !8236
| * | | | Update test-and-deploy-ruby-application-to-heroku.mdWilliam2016-12-211-1/+1
| | | | |
* | | | | Merge branch '25941-odd-overflow-behavior-for-long-issue-headers' into 'master' Alfredo Sumaran2016-12-222-2/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Change earlier to task_status_short to avoid titlebar line wraps Closes #25941 See merge request !8275
| * | | | Change earlier to task_status_short to avoid titlebar line wraps25941-odd-overflow-behavior-for-long-issue-headersdimitrieh2016-12-222-2/+6
| | | | |
* | | | | Merge branch 'markdown-input-symbol-regex' into 'master' Jacob Schatz2016-12-222-3/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Stops GFM special characters interfering with markdown tags See merge request !8265
| * | | | | Added tests for special charactersmarkdown-input-symbol-regexPhil Hughes2016-12-221-0/+18
| | | | | |
| * | | | | Stops GFM special characters interfering with markdown tagsPhil Hughes2016-12-221-3/+4
| | | | | |
* | | | | | Merge branch 'pc-add-gitaly-to-architecture' into 'master' Sid Sijbrandij2016-12-223-5/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly to the architecture of the application See merge request !8264
| * | | | | | Update architecture diagramPablo Carranza2016-12-221-0/+0
| | | | | | |
| * | | | | | Add changelog entrypc-add-gitaly-to-architecturePablo Carranza2016-12-221-0/+4
| | | | | | |
| * | | | | | Add Gitaly to the architecture of the applicationPablo Carranza2016-12-222-5/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Added both to the graph, and to the high level overview. Explaining what is the goal of the system and how does it connect to the other systems.
* | | | | | Merge branch 'zj-slack-docs' into 'master' Sean Packham2016-12-223-0/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slack docs [ci skip] See merge request !8269
| * | | | | | List all commandsZ.J. van de Weg2016-12-222-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Slack docs [ci skip]Z.J. van de Weg2016-12-222-0/+22
| | | | | | |
* | | | | | | Merge branch '25951-labels-are-not-consistent-on-all-pages' into 'master' Fatih Acet2016-12-221-6/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Labels are not consistent on all pages" Closes #25951 See merge request !8256
| * | | | | | | Removed color-label overwrites25951-labels-are-not-consistent-on-all-pagesLuke "Jared" Bennett2016-12-221-6/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'increase-left-padding-of-filter-row-labels' into 'master' Fatih Acet2016-12-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase left padding of filter row labels See merge request !8258
| * | | | | | | Increase left padding of filter row labelsincrease-left-padding-of-filter-row-labelsLuke "Jared" Bennett2016-12-221-1/+1
| | | | | | | |
* | | | | | | | Update VERSION to 8.16.0-prev8.16.0.preDouglas Barbosa Alexandre2016-12-221-1/+1
| | | | | | | |
* | | | | | | | Update CHANGELOG.md for 8.15.0Douglas Barbosa Alexandre2016-12-22198-797/+207
| |_|_|_|/ / / |/| | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch '25979-fix-todos-on-failed-build' into 'master' Robert Speicher2016-12-223-1/+21
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix viewing "build failed" TODOs Closes #25979 See merge request !8262
| * | | | | | Fix viewing "build failed" TODOsNick Thomas2016-12-223-1/+21
| |/ / / / /
* | | | | | Merge branch 'zj-mattermost-auto-config-docs' into 'master' Sean Packham2016-12-221-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs on MM auto config See merge request !8230
| * | | | | | Docs on MM auto configzj-mattermost-auto-config-docsZ.J. van de Weg2016-12-211-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'zj-slack-404-error' into 'master' Kamil Trzciński2016-12-222-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix format of Slack when result is nil Closes #25954 See merge request !8248
| * | | | | | | Fix format of Slack when result is nilzj-slack-404-errorZ.J. van de Weg2016-12-222-2/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-hover-pipeline' into 'master' Fatih Acet2016-12-222-14/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hover pipeline See merge request !8253
| * | | | | | | Fix hover in dropdowns, make closer to the mockupsfix-hover-pipelineFilipa Lacerda2016-12-221-12/+49
| | | | | | | |
| * | | | | | | Fix broken dropdownFilipa Lacerda2016-12-221-2/+2
| |/ / / / / /
* | | | | | | Merge branch '25961-spec-list-blank' into 'master' Fatih Acet2016-12-224-5/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dropdown content non appearing in MR view Closes #25961 See merge request !8255
| * | | | | | | Fix dropdown content non appearing in MR view25961-spec-list-blankFilipa Lacerda2016-12-224-5/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Add MR ID to Changelog entry
* | | | | | | Merge branch 'autodeploy-docs-tweaks' into 'master' Kamil Trzciński2016-12-222-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve autodeploy docs See merge request !8242