summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-196-26/+66
|
* Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into ↵Jacob Schatz2017-06-191-7/+7
|\ | | | | | | | | | | | | | | | | 'master' Re-enable autocomplete for milestones, tags, releases, and wiki Closes #33598 See merge request !12110
| * Re-enable autocomplete for milestones, tags, releases, and wikiEric Eastwood2017-06-191-7/+7
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33598
* | Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'Clement Ho2017-06-195-5/+23
|\ \ | | | | | | | | | | | | | | | | | | Disable autocomplete on snippets comments Closes #33594 See merge request !12108
| * | Disable autocomplete on snippets commentsEric Eastwood2017-06-195-5/+23
| |/ | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33594 Was supposedly fixed in MR for https://gitlab.com/gitlab-org/gitlab-ce/issues/32086 but seeing this pop up again
* | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-192-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Don't display comment on unchanged line on both sides in parallel diff Closes #33864 See merge request !12275
| * | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-192-3/+3
| | |
* | | Merge branch '25164-disable-fork-on-project-limit' into 'master'Rémy Coutable2017-06-191-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disable fork button on project limit Closes #25164 See merge request !12145
| * | | Disable fork button on project limitvanadium232017-06-161-0/+4
| | | |
* | | | Merge branch 'reduce-sidekiq-wait-timings' into 'master'Rémy Coutable2017-06-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce wait timings for Sidekiq jobs See merge request !12270
| * | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the time spent waiting for Sidekiq jobs to complete in JobWaiter, and reduces the sleep interval when trying to acquire the lease for refreshing authorizations. These changes should reduce the time spent just waiting for a lock, which we seem to be spending most time in when running the AuthorizedProjectsWorker.
* | | | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into ↵Douwe Maan2017-06-191-13/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensures default user limits when external user is unchecked Closes #30725 See merge request !12218
| * | | | refactors user model validations30725-reset-user-limits-when-unchecking-external-userTiago Botelho2017-06-191-9/+9
| | | | |
| * | | | Ensures default user limits when external user is uncheckedTiago Botelho2017-06-161-6/+9
| | | | |
* | | | | Use color inputs for broadcast messagesAnnabel Dunstone Gray2017-06-191-2/+2
| | | | |
* | | | | Merge branch 'winh-label-filter-hover' into 'master'Annabel Dunstone Gray2017-06-192-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Darken label color in search filter when hovering Closes #31899 See merge request !12182
| * | | | Darken label color in search filter when hoveringwinh-label-filter-hoverwinh2017-06-162-1/+2
| | | | |
* | | | | Merge branch '33819-authorby' into 'master'Douwe Maan2017-06-191-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | correct ByAuthor translation in commit box Closes #33819 See merge request !12256
| * | | | correct ByAuthor translation in commit box33819-authorbySimon Knox2017-06-191-1/+1
| | | | |
* | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-192-39/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add "project was moved" error messages for git See merge request !11259
| * | | | | Add “Project moved” error to Git-over-HTTPMichael Kozono2017-06-162-39/+9
| | |_|_|/ | |/| | |
* | | | | [#27697] Make the arrow icons consistent in dropdownTM Lee2017-06-197-26/+53
| | | | |
* | | | | Merge branch 'add-since-and-until-params-to-issuables' into 'master'Rémy Coutable2017-06-191-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add created_after and created_before params to issuables Closes #32901 See merge request !12151
| * | | | | add since and until params to issuablesKyle Bishop2017-06-181-0/+13
| | | | | |
* | | | | | Merge branch '33461-display-user-id' into 'master'Grzegorz Bizon2017-06-191-4/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display own user id in account settings pages Closes #33461 See merge request !12141
| * | | | | | #33461: Display own user id in account settings pageRiccardo Padovani2017-06-131-4/+11
| |/ / / / /
* | | | | | Merge branch 'consistent-filtered-search-boards' into 'master'Phil Hughes2017-06-191-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make filtered search boards more consistent with EE Closes #33723 See merge request !12235
| * | | | | | Make filtered search boards more consistent with EEconsistent-filtered-search-boardsClement Ho2017-06-161-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'consistent-dropdown-hint' into 'master'Phil Hughes2017-06-191-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make dropdown hint consistent with EE version Closes #33721 See merge request !12234
| * | | | | Make dropdown hint consistent with EE versionconsistent-dropdown-hintClement Ho2017-06-161-1/+1
| |/ / / /
* | | | | Merge branch 'mr-widget-memory-usage-tech-debt-fix' into 'master'Phil Hughes2017-06-171-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Changed utilites imports from ~ to relative paths Closes #33485 See merge request !12026
| * | | | Changed utilites imports from ~ to relative pathsJose Ivan Vargas2017-06-161-2/+2
| | | | |
* | | | | Fixed overflow on mobile screens for the slash commandsJose Ivan Vargas Lopez2017-06-161-0/+11
| | | | |
* | | | | Merge branch 'backport-panels-styles-from-ee' into 'master'Annabel Dunstone Gray2017-06-161-42/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport panels.scss styles from EE See merge request !12206
| * | | | | Backport panels styles from EEbackport-panels-styles-from-eeEric Eastwood2017-06-151-42/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/blob/43a570dcf5cbd0a98572d5601e9000e906791db0/app/assets/stylesheets/framework/panels.scss
* | | | | | Merge branch 'merge-request-diffs-table' into 'master'Douwe Maan2017-06-162-17/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add table for files in merge request diffs See merge request !12047
| * | | | | | Add table for files in merge request diffsSean McGivern2017-06-162-17/+48
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an ID-less table containing one row per file, per merge request diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised currently, with the advantage that we can easily query the attributes of this new table. It does not migrate existing data, so we have fallback code when the legacy st_diffs column is present instead. For a merge request diff to be valid, it should have at most one of: * Rows in this new table, with the correct merge_request_diff_id. * A non-NULL st_diffs column. It may have neither, if the diff is empty.
* | | | | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-161-3/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show private subgroups if member of parent group Closes #32135 See merge request !11764
| * | | | | Make the GroupFinder specs more strictToon Claes2017-06-151-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the results match exactly and project authorizations do allow access to sibling groups/projects deeper down. Also apply WHERE scopes before running the UNION, to increase performance.
| * | | | | Subgroups page should show groups authorized through inheritanceToon Claes2017-06-151-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user is authorized to a group, they are also authorized to see all the ancestor groups and descendant groups. When a user is authorized to a project, they are authorized to see all the ancestor groups too. Closes #32135 See merge request !11764
* | | | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-1625-84/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811
| * | | | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-1525-84/+84
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand`
* | | | | Merge branch 'issue_20900' into 'master'Sean McGivern2017-06-1612-228/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove issuable drag and drop and sorting from milestone view Closes #20900 See merge request !11950
| * | | | | Improve method names and add more specsFelipe Artur2017-06-168-20/+21
| | | | | |
| * | | | | Migration - Remove position field from issues and merge requestsFelipe Artur2017-06-162-0/+6
| | | | | |
| * | | | | Remove old specs and add new onesFelipe Artur2017-06-162-3/+7
| | | | | |
| * | | | | Order merge requests by priorityFelipe Artur2017-06-168-156/+10
| | | | | |
| * | | | | Order issues by priorityFelipe Artur2017-06-165-13/+15
| | | | | |
| * | | | | Remove Drag and drop and sorting from milestone viewFelipe Artur2017-06-166-74/+5
| | | | | |
* | | | | | Merge branch '33739-blame-legend-bottom-border' into 'master'Annabel Dunstone Gray2017-06-161-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing bottom border to blame age legend Closes #33739 See merge request !12205
View Lorry Controller Status