summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Uniform style between all upload forms40780-choose-fileFilipa Lacerda2017-12-224-30/+23
|
* Update Browse file to Choose file in all occurencesFilipa Lacerda2017-12-212-2/+2
|
* Resolve "Decouple multi-file editor from file list"Tim Zallmann2017-12-2112-133/+127
|
* Merge branch '40063-markdown-editor-improvements' into 'master'Filipa Lacerda2017-12-211-1/+1
|\ | | | | | | | | | | | | Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994
| * Hide & show toolbar on MR pageAnnabel Dunstone Gray2017-12-181-1/+1
| |
* | Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'Rémy Coutable2017-12-212-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 viewMark Fletcher2017-12-201-17/+1
| | |
| * | Accept options hash for Groups dropdownMark Fletcher2017-12-201-2/+3
| | |
* | | Use UserSerializer instead of `User.to_json`Robert Speicher2017-12-191-2/+1
|/ /
* | Show inline edit button for issuesClement Ho2017-12-191-5/+0
| |
* | Fix tags in the Activity tab not being clickableMario de la Ossa2017-12-191-1/+2
| |
* | Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-191-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 viewMario de la Ossa2017-12-181-1/+1
| |/
* | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-191-25/+25
|\ \ | | | | | | | | | | | | Improve performance of Pipelines#index.json See merge request gitlab-org/gitlab-ce!14846
| * | Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-191-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 pageClement Ho2017-12-191-2/+8
| | |
* | | Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-194-0/+15
|\ \ \ | |_|/ |/| | | | | | | | Fix cluster enviroment missing See merge request gitlab-org/gitlab-ce!15973
| * | Inverse the has_multiple_clusters? helper usagefix-cluster-enviroment-missingMatija Čupić2017-12-184-4/+4
| | |
| * | Use helper for feature check in cluster partialsMatija Čupić2017-12-184-2/+10
| | |
| * | Revert save button caption changeMatija Čupić2017-12-161-1/+1
| | |
| * | Add environment scope field to cluster formsMatija Čupić2017-12-164-1/+8
| | |
* | | Only render signout screen when user is signed outFilipa Lacerda2017-12-181-6/+7
| | |
* | | Merge branch '39298-list-of-avatars-2' into 'master'Rémy Coutable2017-12-181-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 +1Jacopo2017-12-181-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ński2017-12-181-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 rulesStan Hu2017-12-121-1/+1
| | |
| * | Create a play_pipeline_schedule policy and use itStan Hu2017-12-121-1/+1
| | |
| * | Add button to run scheduled pipeline immediatelyStan Hu2017-12-121-1/+3
| | | | | | | | | | | | Closes #38741
* | | Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-181-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-attributesOswaldo Ferreira2017-12-151-1/+1
| | | | | | | | | | | | | | | | requests
* | | | Fix job count in pipeline success mailChristiaan Van den Poel2017-12-184-5/+5
| |_|/ |/| |
* | | Merge branch '38019-hide-runner-token' into 'master'Clement Ho2017-12-153-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-tokenEric Eastwood2017-12-153-5/+15
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38019
* | | | fix issue #39843 Incorrect guidance stating blocked users will be removed ↵Cesar Apodaca2017-12-151-1/+0
| | | | | | | | | | | | | | | | from groups and projects as members
* | | | Merge branch '38239-update-toggle-design' into 'master'Filipa Lacerda2017-12-152-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 togglesKushal Pandya2017-12-152-5/+8
| | | |
* | | | Merge branch '41073-fix-help-links' into 'master'Rémy Coutable2017-12-151-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-linksBrett Walker2017-12-131-1/+1
| | | | |
* | | | | Fix UX issues in system info pageGilbert Roulot2017-12-151-3/+3
| | | | |
* | | | | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-152-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 filePhil Hughes2017-12-142-2/+2
| | | | | |
| * | | | | Added LFS badge to indicate LFS tracked filesPhil Hughes2017-12-112-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Closes #15567
* | | | | | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-141-2/+0
| | | | | |
* | | | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master'Sean McGivern2017-12-141-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 authoredAnnabel Dunstone Gray2017-12-131-1/+1
| | | | | | |
| * | | | | | Use author info on commits list page rather than most recent commit dateAnnabel Dunstone Gray2017-12-111-1/+1
| | | | | | |
* | | | | | | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-132-4/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issuable status icons Closes #33926 See merge request gitlab-org/gitlab-ce!15898
| * | | | | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-132-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 Hughes2017-12-131-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-debtAnnabel Dunstone Gray2017-12-081-1/+1
| | | | | | |