Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Uniform style between all upload forms40780-choose-file | Filipa Lacerda | 2017-12-22 | 4 | -30/+23 |
| | |||||
* | Update Browse file to Choose file in all occurences | Filipa Lacerda | 2017-12-21 | 2 | -2/+2 |
| | |||||
* | Resolve "Decouple multi-file editor from file list" | Tim Zallmann | 2017-12-21 | 12 | -133/+127 |
| | |||||
* | Merge branch '40063-markdown-editor-improvements' into 'master' | Filipa Lacerda | 2017-12-21 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994 | ||||
| * | Hide & show toolbar on MR page | Annabel Dunstone Gray | 2017-12-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master' | Rémy Coutable | 2017-12-21 | 2 | -19/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | Enables ordering groups and their children by name in the web interface Closes #24962 et #36958 See merge request gitlab-org/gitlab-ce!16045 | ||||
| * | | Employ Groups dropdown in admin view | Mark Fletcher | 2017-12-20 | 1 | -17/+1 |
| | | | |||||
| * | | Accept options hash for Groups dropdown | Mark Fletcher | 2017-12-20 | 1 | -2/+3 |
| | | | |||||
* | | | Use UserSerializer instead of `User.to_json` | Robert Speicher | 2017-12-19 | 1 | -2/+1 |
|/ / | |||||
* | | Show inline edit button for issues | Clement Ho | 2017-12-19 | 1 | -5/+0 |
| | | |||||
* | | Fix tags in the Activity tab not being clickable | Mario de la Ossa | 2017-12-19 | 1 | -1/+2 |
| | | |||||
* | | Merge branch '36020-private-npm-modules' into 'master' | Douwe Maan | 2017-12-19 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Do not generate links for private NPM modules in blob view Closes #36020 See merge request gitlab-org/gitlab-ce!16002 | ||||
| * | | Do not generate links for private NPM modules in blob view | Mario de la Ossa | 2017-12-18 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'zj-gitaly-pipelines-n-1' into 'master' | Robert Speicher | 2017-12-19 | 1 | -25/+25 |
|\ \ | | | | | | | | | | | | | Improve performance of Pipelines#index.json See merge request gitlab-org/gitlab-ce!14846 | ||||
| * | | Load commit in batches for pipelines#index | Zeger-Jan van de Weg | 2017-12-19 | 1 | -25/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses `list_commits_by_oid` on the CommitService, to request the needed commits for pipelines. These commits are needed to display the user that created the commit and the commit title. This includes fixes for tests failing that depended on the commit being `nil`. However, now these are batch loaded, this doesn't happen anymore and the commits are an instance of BatchLoader. | ||||
* | | | Fix shortcut links on help page | Clement Ho | 2017-12-19 | 1 | -2/+8 |
| | | | |||||
* | | | Merge branch 'fix-cluster-enviroment-missing' into 'master' | Kamil Trzciński | 2017-12-19 | 4 | -0/+15 |
|\ \ \ | |_|/ |/| | | | | | | | | Fix cluster enviroment missing See merge request gitlab-org/gitlab-ce!15973 | ||||
| * | | Inverse the has_multiple_clusters? helper usagefix-cluster-enviroment-missing | Matija Čupić | 2017-12-18 | 4 | -4/+4 |
| | | | |||||
| * | | Use helper for feature check in cluster partials | Matija Čupić | 2017-12-18 | 4 | -2/+10 |
| | | | |||||
| * | | Revert save button caption change | Matija Čupić | 2017-12-16 | 1 | -1/+1 |
| | | | |||||
| * | | Add environment scope field to cluster forms | Matija Čupić | 2017-12-16 | 4 | -1/+8 |
| | | | |||||
* | | | Only render signout screen when user is signed out | Filipa Lacerda | 2017-12-18 | 1 | -6/+7 |
| | | | |||||
* | | | Merge branch '39298-list-of-avatars-2' into 'master' | Rémy Coutable | 2017-12-18 | 1 | -11/+7 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | List of avatars should never show +1 Closes #39298 See merge request gitlab-org/gitlab-ce!15972 | ||||
| * | | | List of avatars should never show +1 | Jacopo | 2017-12-18 | 1 | -11/+7 |
| |/ / | | | | | | | | | | | | | The list of avatars should never show +1. If you have +1, that means you can use that space to show that person's avatar, for that reason should always start with +2. | ||||
* | | | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master' | Kamil Trzciński | 2017-12-18 | 1 | -1/+3 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700 | ||||
| * | | Fix conditions for checking pipeline schedule rules | Stan Hu | 2017-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Create a play_pipeline_schedule policy and use it | Stan Hu | 2017-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Add button to run scheduled pipeline immediately | Stan Hu | 2017-12-12 | 1 | -1/+3 |
| | | | | | | | | | | | | Closes #38741 | ||||
* | | | Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master' | Sean McGivern | 2017-12-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847 | ||||
| * | | | Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributes | Oswaldo Ferreira | 2017-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | requests | ||||
* | | | | Fix job count in pipeline success mail | Christiaan Van den Poel | 2017-12-18 | 4 | -5/+5 |
| |_|/ |/| | | |||||
* | | | Merge branch '38019-hide-runner-token' into 'master' | Clement Ho | 2017-12-15 | 3 | -5/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Hide runner token in CI/CD settings page Closes #38019 See merge request gitlab-org/gitlab-ce!15918 | ||||
| * | | | Hide runner token in CI/CD settings page38019-hide-runner-token | Eric Eastwood | 2017-12-15 | 3 | -5/+15 |
| | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38019 | ||||
* | | | | fix issue #39843 Incorrect guidance stating blocked users will be removed ↵ | Cesar Apodaca | 2017-12-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | from groups and projects as members | ||||
* | | | | Merge branch '38239-update-toggle-design' into 'master' | Filipa Lacerda | 2017-12-15 | 2 | -5/+8 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Update feature toggle design to use icons and make it i18n friendly Closes #38239 See merge request gitlab-org/gitlab-ce!15904 | ||||
| * | | | Use icons instead of string labels for toggles | Kushal Pandya | 2017-12-15 | 2 | -5/+8 |
| | | | | |||||
* | | | | Merge branch '41073-fix-help-links' into 'master' | Rémy Coutable | 2017-12-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make help link open in new tab Closes #41073 See merge request gitlab-org/gitlab-ce!15912 | ||||
| * | | | | make link open in new tab41073-fix-help-links | Brett Walker | 2017-12-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix UX issues in system info page | Gilbert Roulot | 2017-12-15 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'lfs-badge' into 'master' | Douwe Maan | 2017-12-15 | 2 | -0/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added LFS badge to indicate LFS tracked files Closes #15567 See merge request gitlab-org/gitlab-ce!15845 | ||||
| * | | | | | moved lfs blob fetch from extractspath file | Phil Hughes | 2017-12-14 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Added LFS badge to indicate LFS tracked files | Phil Hughes | 2017-12-11 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #15567 | ||||
* | | | | | | Converted JS modules into exported modulesph-es-modules | Phil Hughes | 2017-12-14 | 1 | -2/+0 |
| | | | | | | |||||
* | | | | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master' | Sean McGivern | 2017-12-14 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use author info on commits list page rather than most recent commit date Closes #25317 See merge request gitlab-org/gitlab-ce!15868 | ||||
| * | | | | | | Change committed text to authored | Annabel Dunstone Gray | 2017-12-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Use author info on commits list page rather than most recent commit date | Annabel Dunstone Gray | 2017-12-11 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch '33926-update-issuable-icons' into 'master' | Annabel Dunstone Gray | 2017-12-13 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issuable status icons Closes #33926 See merge request gitlab-org/gitlab-ce!15898 | ||||
| * | | | | | | Update issuable status icons33926-update-issuable-icons | Eric Eastwood | 2017-12-13 | 2 | -4/+4 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367 | ||||
* | | | | | | Merge branch 'new-nav-tech-debt' into 'master' | Phil Hughes | 2017-12-13 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove page-with-new-nav class See merge request gitlab-org/gitlab-ce!15819 | ||||
| * | | | | | | Rename page-with-sidebar to layout-pagenew-nav-tech-debt | Annabel Dunstone Gray | 2017-12-08 | 1 | -1/+1 |
| | | | | | | |