Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix some incorrect usage of translation helpersfix-i18n-helpers | Ruben Davila | 2017-06-19 | 6 | -8/+26 |
| | | | | | Conflicts: app/views/projects/pipeline_schedules/_form.html.haml | ||||
* | Merge branch '28139-use-color-input-broadcast-messages' into 'master' | Phil Hughes | 2017-06-19 | 2 | -2/+6 |
|\ | | | | | | | | | | | | | Use color inputs for broadcast messages Closes #28139 See merge request !12237 | ||||
| * | Use color inputs for broadcast messages | Annabel Dunstone Gray | 2017-06-19 | 2 | -2/+6 |
|/ | |||||
* | Merge branch 'group-label-permissions-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 1 | -0/+1 |
|\ | | | | | | | | | Docs permissions for group labels See merge request !12269 | ||||
| * | Docs permissions for group labelsgroup-label-permissions-docs | Victor Wu | 2017-06-19 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'winh-label-filter-hover' into 'master' | Annabel Dunstone Gray | 2017-06-19 | 2 | -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-hover | winh | 2017-06-16 | 2 | -1/+2 |
| | | | |||||
* | | | Merge branch '33819-authorby' into 'master' | Douwe Maan | 2017-06-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | correct ByAuthor translation in commit box Closes #33819 See merge request !12256 | ||||
| * | | | correct ByAuthor translation in commit box33819-authorby | Simon Knox | 2017-06-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master' | Douwe Maan | 2017-06-19 | 12 | -68/+265 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add "project was moved" error messages for git See merge request !11259 | ||||
| * | | | | Add specific test case | Michael Kozono | 2017-06-16 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | This test and its context exist only to ensure this behavior is fixed: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11259#note_29262426 | ||||
| * | | | | Add “Project moved” error to Git-over-HTTP | Michael Kozono | 2017-06-16 | 3 | -40/+37 |
| | | | | | |||||
| * | | | | Add “Project moved” error to Git-over-SSH | Michael Kozono | 2017-06-16 | 9 | -28/+208 |
| | | | | | |||||
* | | | | | Merge branch '27697-make-arrow-icons-consistent-in-dropdown' into 'master'adam-is-testing-mr-templates | Annabel Dunstone Gray | 2017-06-19 | 8 | -26/+57 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | [#27697] Make the arrow icons consistent in dropdown Closes #27697 See merge request !9659 | ||||
| * | | | | [#27697] Make the arrow icons consistent in dropdown | TM Lee | 2017-06-19 | 8 | -26/+57 |
|/ / / / | |||||
* | | | | Merge branch 'add-since-and-until-params-to-issuables' into 'master' | Rémy Coutable | 2017-06-19 | 8 | -3/+87 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add created_after and created_before params to issuables Closes #32901 See merge request !12151 | ||||
| * | | | | add since and until params to issuables | Kyle Bishop | 2017-06-18 | 8 | -3/+87 |
| | | | | | |||||
* | | | | | Merge branch '33461-display-user-id' into 'master' | Grzegorz Bizon | 2017-06-19 | 3 | -4/+34 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display own user id in account settings pages Closes #33461 See merge request !12141 | ||||
| * | | | | | Update test to use single quotes and Four-Phase test conventions | Riccardo Padovani | 2017-06-15 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | #33641: add spec for profile page | Riccardo Padovani | 2017-06-15 | 1 | -0/+18 |
| | | | | | | |||||
| * | | | | | 33641: Add changelog | Riccardo Padovani | 2017-06-13 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | #33461: Display own user id in account settings page | Riccardo Padovani | 2017-06-13 | 1 | -4/+11 |
| |/ / / / | |||||
* | | | | | Merge branch '33824-update-mr-prometheus-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 2 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update Prometheus Merge Request Metrics page See merge request !12259 | ||||
| * | | | | | Update Prometheus Merge Request Metrics page | Joshua Lambert | 2017-06-19 | 2 | -4/+4 |
|/ / / / / | |||||
* | | | | | Merge branch '26212-upload-user-avatar-trough-api' into 'master' | Rémy Coutable | 2017-06-19 | 4 | -0/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept image for avatar in user API Closes #26212 See merge request !12143 | ||||
| * | | | | | Accept image for avatar in user API | vanadium23 | 2017-06-16 | 4 | -0/+17 |
| | | | | | | |||||
* | | | | | | Merge branch 'issue_33205' into 'master' | Sean McGivern | 2017-06-19 | 3 | -4/+28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API bug accepting wrong merge requests parameters Closes #33205 See merge request !12173 | ||||
| * | | | | | | Fix API bug accepting wrong merge requests parametersissue_33205 | Felipe Artur | 2017-06-16 | 3 | -4/+28 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'consistent-filtered-search-boards' into 'master' | Phil Hughes | 2017-06-19 | 1 | -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-boards | Clement Ho | 2017-06-16 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'consistent-dropdown-hint' into 'master' | Phil Hughes | 2017-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make dropdown hint consistent with EE version Closes #33721 See merge request !12234 | ||||
| * | | | | | | | Make dropdown hint consistent with EE versionconsistent-dropdown-hint | Clement Ho | 2017-06-16 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'fix-atom-eslint' into 'master' | Tim Zallmann | 2017-06-18 | 1 | -16/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix eslint import resolver in Atom v1.18.0 See merge request !12238 | ||||
| * | | | | | | | refactor zopfli fallback configfix-atom-eslint | Mike Greiling | 2017-06-16 | 1 | -15/+6 |
| | | | | | | | | |||||
| * | | | | | | | don't make assumptions about command line arguments invoking webpack config | Mike Greiling | 2017-06-16 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'mr-widget-memory-usage-tech-debt-fix' into 'master' | Phil Hughes | 2017-06-17 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed utilites imports from ~ to relative paths Closes #33485 See merge request !12026 | ||||
| * | | | | | | | | Changed utilites imports from ~ to relative paths | Jose Ivan Vargas | 2017-06-16 | 2 | -2/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs-revert-11842' into 'master' | Stan Hu | 2017-06-16 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert 1e8dbd46 See merge request !12236 | ||||
| * | | | | | | | | Partially revert 1e8dbd46 | Robert Speicher | 2017-06-16 | 1 | -2/+1 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/33736#note_32561501 | ||||
* | | | | | | | | Merge branch 'remove_unnecessary_spec_file' into 'master' | Robert Speicher | 2017-06-16 | 1 | -102/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary spec file See merge request !12233 | ||||
| * | | | | | | | | Remove unnecessary spec file | Felipe Artur | 2017-06-16 | 1 | -102/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'increase-karma-socket-timeout' into 'master' | Clement Ho | 2017-06-16 | 3 | -36/+49 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase karma socket timeout Closes #33735 See merge request !12226 | ||||
| * | | | | | | | | Increase karma socket timeout | Mike Greiling | 2017-06-16 | 3 | -36/+49 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'boards-spec-fix' into 'master' | Robert Speicher | 2017-06-16 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes boards_spec failure Closes #33614 See merge request !12230 | ||||
| * | | | | | | | Fixes boards_spec failureboards-spec-fix | Phil Hughes | 2017-06-16 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33614 | ||||
* | | | | | | | | Merge branch 'fix-overflow-slash-commands' into 'master' | Annabel Dunstone Gray | 2017-06-16 | 2 | -0/+15 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed overflow on mobile screens for the slash commands Closes #29013 See merge request !12100 | ||||
| * | | | | | | | Fixed overflow on mobile screens for the slash commands | Jose Ivan Vargas Lopez | 2017-06-16 | 2 | -0/+15 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'backport-panels-styles-from-ee' into 'master' | Annabel Dunstone Gray | 2017-06-16 | 1 | -42/+48 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Backport panels.scss styles from EE See merge request !12206 | ||||
| * | | | | | | Backport panels styles from EEbackport-panels-styles-from-ee | Eric Eastwood | 2017-06-15 | 1 | -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 Maan | 2017-06-16 | 24 | -52/+271 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add table for files in merge request diffs See merge request !12047 |