summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Fix replying to commit comments on MRs from forksSean McGivern2017-07-287-3/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A commit comment shows in the MR, but if the MR is from a fork, it will have a different project ID to the MR's target project. In that case, add an note_project_id param so that we can pick the correct project for the note.
* | | | | | | | | | Merge branch 'bugfix/fix_v3_project_hooks_build_events' into 'master'Rémy Coutable2017-07-283-5/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id See merge request !12673
| * | | | | | | | | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_idRichard Clamp2017-07-283-5/+13
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Grzegorz Bizon2017-07-283-3/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline' into 'master' Resolve "Comment appears in a wrong place after changing diff view to inline" Closes #35695 See merge request !13156
| * | | | | | | | | Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inlineSean McGivern2017-07-283-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you change the diff view (inline / side-by-side), we set a cookie based on that new view. When you add a comment, we choose the style to use in the response based on that cookie. However, when you have just changed diff style, the request cookie will contain the old value, so we should use the view param instead.
* | | | | | | | | | Merge branch '26890-sort-branches' into 'master'Rémy Coutable2017-07-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the default sort order for branches 'recently updated' rather than by name. Closes #26890 See merge request !8666
| * | | | | | | | | WIP: This makes the default sort order for branches 'recently updated' ↵26890-sort-branchesMatt Lee2017-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than by name.
* | | | | | | | | | Merge branch ↵Sean McGivern2017-07-283-1/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix-500-error-when-rendering-avatar-for-deleted-project-creator' into 'master' Fix 500 error when rendering avatar for deleted project creator See merge request !13110
| * | | | | | | | | | Fix 500 error when rendering avatar for deleted project creatorAthar Hameed2017-07-283-1/+24
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'merge-issuable-reopened-into-opened-state' into 'master'Sean McGivern2017-07-2821-49/+65
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge issuable "reopened" state into "opened" See merge request !12972
| * | | | | | | | | | Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-2821-49/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having two states that essentially mean the same thing is very much like having a boolean "true" and boolean "mostly-true": it's rather silly. This commit merges the "reopened" state into the "opened" state while taking care of system notes still showing messages along the lines of "Alice reopened this issue". A big benefit from having only two states (opened and closed) is that indexing and querying becomes simpler and more performant. For example, to get all the opened queries we no longer have to query both states: SELECT * FROM issues WHERE project_id = 2 AND state IN ('opened', 'reopened'); Instead we can query a single state directly, which can be much faster: SELECT * FROM issues WHERE project_id = 2 AND state = 'opened'; Further, only having two states makes indexing easier as we will only ever filter (and thus scan an index) using a single value. Partial indexes could help but aren't supported on MySQL, complicating the development process and not being helpful for MySQL.
* | | | | | | | | | | Merge branch 'techbeacon_ci' into 'master'Rémy Coutable2017-07-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added article from techbeacon on CI See merge request !10452
| * | | | | | | | | | | added article from techbeacon on CItechbeacon_ciChad Malchow2017-04-041-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-281-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab_flow.md, Teatro seems to be completely dead, see also… See merge request !13157
| * | | | | | | | | | | | Update gitlab_flow.md, Teatro seems to be completely dead, see also ↵bart2017-07-281-1/+0
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://forum.gitlab.com/t/gitlab-flow-documentation-teatro/7774
* | | | | | | | | | | | Merge branch 'log_webhook_timeout' into 'master'Rémy Coutable2017-07-282-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log web hook execution timeout events See merge request !13134
| * | | | | | | | | | | | Log web hook execution timeout eventsAlex Lossent2017-07-272-2/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a web hook HTTP request is sent but no response comes within a certain time (10s by default), the hook execution fails and will be retried. This commit makes such timeouts visible in the web hook log, like connection timeouts already are. Also log "no route to host" errors.
* | | | | | | | | | | | Merge branch 'docs-metrics-haproxy' into 'master'Rémy Coutable2017-07-282-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix HAProxy name and exporter's link See merge request !13091
| * | | | | | | | | | | | Docs: fix HAProxy name and exporter's linkDênis Volpato Martins2017-07-252-5/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dm-api-csrf-token-verification' into 'master'Sean McGivern2017-07-281-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add log messages to clarify log messages about API CSRF token verification failure Closes #35705 See merge request !13158
| * | | | | | | | | | | | Add log messages to clarify log messages about API CSRF token verification ↵dm-api-csrf-token-verificationDouwe Maan2017-07-281-0/+8
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure
* | | | | | | | | | | | Merge branch 'remove-default-access-levels' into 'master'Rémy Coutable2017-07-282-15/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make access level for protected tag factories more compatible with EE See merge request !13133
| * | | | | | | | | | | Make access level more compatible with EELin Jen-Shin2017-07-282-15/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the behaviour would be similar in CE and EE
* | | | | | | | | | | | Merge branch '35691-images-in-wiki-display-have-wrong-size' into 'master'Filipa Lacerda2017-07-281-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Images in Wiki display have wrong size" Closes #35691 See merge request !13153
| * | | | | | | | | | | | none is not a CSS Value for sizes ;-)Tim Zallmann2017-07-281-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Update CHANGELOG.md for 9.4.2James Edwards-Jones2017-07-2812-45/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch 'help-page-breadcrumb-title-fix' into 'master'Filipa Lacerda2017-07-282-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the breadcrumb title for help pages Closes #35679 See merge request !13151
| * | | | | | | | | | | | | Fixed the breadcrumb title for help pageshelp-page-breadcrumb-title-fixPhil Hughes2017-07-282-0/+5
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35679
* | | | | | | | | | | | | Merge branch 'ph-inline-js' into 'master'Tim Zallmann2017-07-2823-112/+135
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed inline JS in shared HAML files See merge request !13073
| * | | | | | | | | | | | | fixed form action not submitting the correct URLph-inline-jsPhil Hughes2017-07-281-1/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-28971-1908/+4062
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-27243-1206/+4245
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | fixed label subscription & merge conflictsPhil Hughes2017-07-263-3/+14
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | moved some more inline codePhil Hughes2017-07-256-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed some global variable comments
| * | | | | | | | | | | | | moved some code into new filesPhil Hughes2017-07-256-41/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed duplication of code
| * | | | | | | | | | | | | Removed inline JS in shared HAML filesPhil Hughes2017-07-2516-101/+90
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'Kamil Trzciński2017-07-2817-27/+249
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up from "Allow to use cross project pipelines" ver 2 Closes #35282, gitlab-ee#2604, and #35584 See merge request !13102
| * | | | | | | | | | | | | Expand pipeline_trigger_service_spec by godfat requestfeature/sm/35282-ci_pipeline_variables-2Shinya Maeda2017-07-281-16/+28
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix revert missShinya Maeda2017-07-281-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix static snalysysShinya Maeda2017-07-281-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Revert "Move validate to begin/rescue block"Shinya Maeda2017-07-281-25/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ec3b63bfc6f341df040ae08be4858c7181bcacf.
| * | | | | | | | | | | | | Use let(:params) instead of def paramShinya Maeda2017-07-281-9/+10
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use let(:pipeline) for variables spec in triggers_spec.rbShinya Maeda2017-07-281-2/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove is_a?(Hash) from unless params[:variables] in create_pipeline_variablesShinya Maeda2017-07-281-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use bang for trigger.trigger_requests.createShinya Maeda2017-07-281-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove if pipeline.variables in Ci::Build#variablesShinya Maeda2017-07-281-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix pipelineShinya Maeda2017-07-282-21/+18
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move validate to begin/rescue blockShinya Maeda2017-07-281-14/+19
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fix merge missShinya Maeda2017-07-282-1/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | initShinya Maeda2017-07-2817-32/+247
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
View Lorry Controller Status