summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mk-fix-deploy-key-deletion' into 'master'Yorick Peterse2017-08-011-0/+4
|\ | | | | | | | | | | | | Fix deletion of deploy keys linked to other projects Closes #35630 See merge request !13162
| * Exclude keys linked to other projectsmk-fix-deploy-key-deletionMichael Kozono2017-07-281-0/+4
| |
* | Merge branch '34492-firefox-job' into 'master'Phil Hughes2017-08-011-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Uses jQuery to scroll since setting document.body.scrollTop does not work in firefox Closes #34492 See merge request !13203
| * | Uses jQuery to scroll since setting document.body.scrollTop does not work in ↵34492-firefox-jobFilipa Lacerda2017-07-311-0/+4
| |/ | | | | | | firefox
* | Merge branch '34519-extend-api-group-secret-variable' into 'master'Kamil Trzciński2017-08-011-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Extend API: Group Secret Variable Closes #34519 See merge request !12936
| * | Add changelogShinya Maeda2017-07-191-0/+4
| | |
* | | Allow logged in users to read user list under public restrictionLin Jen-Shin (godfat)2017-08-011-0/+4
| | |
* | | Update CHANGELOG.md for 9.4.3Jose Ivan Vargas2017-07-317-29/+0
| | | | | | | | | [ci skip]
* | | Merge branch 'fix-group-milestone-link-in-issuable-sidebar' into 'master'Robert Speicher2017-07-311-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix group milestone path on issuable sidebar See merge request !13199
| * | | Fix group milestone path on issuable sidebarfix-group-milestone-link-in-issuable-sidebarSean McGivern2017-07-311-0/+4
| | | |
* | | | Merge branch 'mk-fix-wiki-backup' into 'master'Douwe Maan2017-07-311-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix improperly skipped backups of wikis Closes #28854 See merge request !13096
| * | | | Add changelogMichael Kozono2017-07-281-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master'Kamil Trzciński2017-07-311-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve deploy environment chatops slash command Closes #34748 See merge request !13150
| * | | | Add changelog entry for deploy chatops command fixGrzegorz Bizon2017-07-281-0/+4
| | | | |
* | | | | Merge branch '29385/add_shrug_command' into 'master'Rémy Coutable2017-07-311-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes #29385: Add /shrug and /tableflip commands Closes #29385 See merge request !10068
| * | | | Fixes #29385: Add /shrug and /tableflip commandsAlex Ives2017-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated DSL to support substitution definitions - Added substitution definition, inherits from command definition - Added tabelflip and shrug substitutions to interpret service - Added support for substitution definitions to the extractor for preview mode. - Added substitution handling in the interpret service Signed-off-by: Alex Ives <alex@ives.mn>
* | | | | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'Sean McGivern2017-07-311-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor Closes #35752 See merge request !13185
| * | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptordm-ldap-authentication-ssl-verificationDouwe Maan2017-07-311-0/+4
| | | | | |
* | | | | | Merge branch 'breadcrumbs-collapsed-title-width-fix' into 'master'Filipa Lacerda2017-07-311-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed breadcrumb titles aggressively collapsing Closes #35323 See merge request !13166
| * | | | | | Fixed breadcrumb titles aggressively collapsingbreadcrumbs-collapsed-title-width-fixPhil Hughes2017-07-281-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Closes #35323
* | | | | | Merge branch '35672-edge-top-bar' into 'master'Phil Hughes2017-07-311-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix top bar in jobs view for microsoft edge Closes #35672 See merge request !13175
| * | | | | Fix top bar in jobs view for microsoft edge35672-edge-top-barFilipa Lacerda2017-07-291-0/+4
| | |_|/ / | |/| | |
* | | | | Merge branch '35567-fix-relative-urls-in-webpack-public-path' into 'master'Douwe Maan2017-07-311-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix relative_url_root support for webpack chunks Closes #35567 See merge request !13165
| * | | | add CHANGELOG.md entry for !1316535567-fix-relative-urls-in-webpack-public-pathMike Greiling2017-07-281-0/+5
| | | | |
* | | | | Projects logo are not centered vertically on projects pageFlorian Lemaitre2017-07-281-0/+4
| |_|/ / |/| | |
* | | | Merge branch 'dm-large-push-performance' into 'master'Robert Speicher2017-07-281-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load and process at most 100 commits when pushing into default branch Closes #35531 See merge request !13132
| * | | | Load and process at most 100 commits when pushing into default branchDouwe Maan2017-07-281-0/+4
| | | | |
* | | | | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
| * | | | | Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_idRichard Clamp2017-07-281-0/+4
| | | | | |
* | | | | | Merge branch ↵Grzegorz Bizon2017-07-281-0/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Fix 500 error when rendering avatar for deleted project creatorAthar Hameed2017-07-281-0/+4
| | | | | |
* | | | | | Merge branch 'merge-issuable-reopened-into-opened-state' into 'master'Sean McGivern2017-07-281-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Merge issuable "reopened" state into "opened" See merge request !12972
| * | | | | Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Update CHANGELOG.md for 9.4.2James Edwards-Jones2017-07-2811-45/+0
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'help-page-breadcrumb-title-fix' into 'master'Filipa Lacerda2017-07-281-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-0/+4
| | |_|/ / | |/| | | | | | | | | | | | | Closes #35679
* | | | | Merge branch 'zj-delete-mm-team' into 'master'Douwe Maan2017-07-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Mattermost team with GitLab group Closes #30023 See merge request !11362
| * | | | | Remove Mattermost team with GitLab groupZ.J. van de Weg2017-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When destroying a group, now an API call is made to the Mattermost server to request the deletion of the project. Actual team deletion on the Mattermost side happens async, so the runtime shouldn't increase by more than a second.
* | | | | | Global nav (9.0) UI improvementTakuya Noguchi2017-07-281-0/+4
| |/ / / / |/| | | |
* | | | | Merge branch 'tc-api-root-merge-requests' into 'master'Sean McGivern2017-07-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add top-level /merge_requests API endpoint Closes #28422 See merge request !13060
| * | | | | Add top-level /merge_requests API endpointToon Claes2017-07-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add support for additional query parameters: - `author_id`: Returns merge requests created by the given user `id` - `assignee_id`: Returns merge requests assigned to the given user `id` - `scope`: Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`
* | | | | | Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-281-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display specific error message when JIRA test fails Closes #32483 See merge request !13100
| * | | | | | Display specific error message when JIRA test fails32483-jira-errorJarka Kadlecova2017-07-271-0/+4
| | | | | | |
* | | | | | | Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-271-0/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Add all ApplicationSettings attributes to the API See merge request !12851
| * | | | | | Make the attribute list for application settings reusableBob Van Landuyt2017-07-271-0/+4
| | | | | | |
* | | | | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent concurrent editing wiki Closes #1827 See merge request !9707
| * | | | | | | Update changelog appropriatelyHiroyuki Sato2017-07-261-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23302-1025/+191
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/projects/wikis_controller.rb app/views/projects/wikis/edit.html.haml spec/features/projects/wiki/user_updates_wiki_page_spec.rb