summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '40286-hide-full-namespace-groups-tree' into 'master'Phil Hughes2017-12-012-2/+18
|\ | | | | | | | | | | | | Show only group name by default and put full namespace in tooltip in Groups tree Closes #40286 See merge request gitlab-org/gitlab-ce!15650
| * Show only group name by default and put full namespace in tooltipKushal Pandya2017-12-012-2/+18
| |
* | Merge branch 'backstage/gb/build-pipeline-in-a-separate-class' into 'master'Kamil Trzciński2017-12-012-44/+12
|\ \ | | | | | | | | | | | | | | | | | | Extract class responsible for building a pipeline Closes #38460 See merge request gitlab-org/gitlab-ce!14762
| * | Do not set pipeline source after initializationGrzegorz Bizon2017-11-301-1/+0
| | |
| * | Merge branch 'master' into backstage/gb/build-pipeline-in-a-separate-classGrzegorz Bizon2017-11-30968-12831/+20497
| |\ \ | | | | | | | | | | | | * master: (1794 commits)
| * | | Extract class responsible for building a pipelineGrzegorz Bizon2017-10-091-43/+12
| | | |
* | | | Adds validation for Project#ci_config_path not to contain leading slashChristiaan Van den Poel2017-12-011-3/+3
| | | |
* | | | issue note storeSimon Knox2017-11-3012-34/+34
| | | |
* | | | Merge branch 'winh-select2-search-padding' into 'master'Mike Greiling2017-11-301-5/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align Select2 search field Closes #39451 See merge request gitlab-org/gitlab-ce!15048
| * | | | Fix padding for Select2 search fieldWinnie Hellmann2017-11-291-5/+13
| | | | |
* | | | | allow caching options to be specified for counting servicesBrett Walker2017-11-301-1/+7
| | | | |
* | | | | Merge branch '40642-members-tab-not-signed-in' into 'master'Mike Greiling2017-11-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project_members controller when not signed in Closes #40642 See merge request gitlab-org/gitlab-ce!15659
| * | | | | Add project_members controller when not signed in40642-members-tab-not-signed-inAnnabel Dunstone Gray2017-11-291-1/+1
| | | | | |
* | | | | | Merge branch '13634-broadcast-message' into 'master'Tim Zallmann2017-11-302-1/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broadcast message not showing up on login page Closes #13634 See merge request gitlab-org/gitlab-ce!15578
| * | | | | Fix broadcast message not showing up on login pageKushal Pandya2017-11-282-1/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master'Grzegorz Bizon2017-11-3011-61/+126
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector. See merge request gitlab-org/gitlab-ce!15515
| * | | | | Fix feature spec38668-revert-copied-kubernetesservice-logicShinya Maeda2017-11-281-1/+0
| | | | | |
| * | | | | Fix static analysysShinya Maeda2017-11-282-1/+2
| | | | | |
| * | | | | Fix unit testsShinya Maeda2017-11-281-1/+3
| | | | | |
| * | | | | Aling shared_exmaples to "same behavior between KubernetesService and ↵Shinya Maeda2017-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Platform::Kubernetes"
| * | | | | Replce kubernetes_service and deployment_service to deployment_platformShinya Maeda2017-11-288-28/+16
| | | | | |
| * | | | | Add test suit for platform::kubernetesShinya Maeda2017-11-281-7/+7
| | | | | |
| * | | | | Remove logic which glues with KubernetesService, from Platforms::KubernetesShinya Maeda2017-11-282-57/+3
| | | | | |
| * | | | | Fix commentsShinya Maeda2017-11-281-0/+1
| | | | | |
| * | | | | Add deployment platform selectorShinya Maeda2017-11-281-2/+12
| | | | | |
| * | | | | Check diff between KubernetesService and Platforms::Kubernetes. Synchronize ↵Shinya Maeda2017-11-282-67/+62
| | | | | | | | | | | | | | | | | | | | | | | | again.
| * | | | | Revert KubernetesService logic in Platforms::KubernetesShinya Maeda2017-11-281-0/+123
| |/ / / /
* | | | | Merge branch 'master' into multi-file-editor-dirty-diff-indicatorPhil Hughes2017-11-3093-975/+1790
|\ \ \ \ \
| * \ \ \ \ Merge branch 'use-count_commits-directly' into 'master'Douwe Maan2017-11-301-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Count the commits directly See merge request gitlab-org/gitlab-ce!15628
| | * | | | | We could simply count the commitsLin Jen-Shin2017-11-301-1/+2
| | | | | | |
| * | | | | | Merge branch 'protected-branches-names' into 'master'Douwe Maan2017-11-302-2/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only load branch names for protected branch checks See merge request gitlab-org/gitlab-ce!15629
| | * | | | | | Only load branch names for protected branch checksprotected-branches-namesYorick Peterse2017-11-292-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking if a branch is protected we don't need all columns of every protected branch row, instead we only care about the names. By using "select" here we reduce the amount of data we need to send over the wire and load into memory.
| * | | | | | | Merge branch '39455-clone-dropdown-should-not-have-a-tooltip' into 'master'Tim Zallmann2017-11-305-35/+42
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clone dropdown should not have a tooltip" Closes #39455 See merge request gitlab-org/gitlab-ce!15334
| | * | | | | | | Added ssh_button helper specs and addressed ruby code observationsJose Ivan Vargas2017-11-272-22/+26
| | | | | | | | |
| | * | | | | | | UX adjustments and spec correctionsJose Ivan Vargas2017-11-274-34/+8
| | | | | | | | |
| | * | | | | | | Change dropdown button background colorJose Ivan Vargas2017-11-272-1/+5
| | | | | | | | |
| | * | | | | | | Removed tooltip from clone dropdownJose Ivan Vargas2017-11-272-26/+51
| | | | | | | | |
| * | | | | | | | Merge branch '40671-fix-empty-blank-flash-messages' into 'master'Phil Hughes2017-11-301-3/+5
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove blank/empty flash messages caused by nil Closes #40671 See merge request gitlab-org/gitlab-ce!15658
| | * | | | | | | Remove blank flash messages caused by nil40671-fix-empty-blank-flash-messagesEric Eastwood2017-11-291-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40671 See https://gitlab.com/gitlab-org/gitlab-ce/blob/f7254a4060b30e3134c6cf932eaba0fc8e249e9a/app/controllers/sessions_controller.rb#L42 for an example of where we set `flash[:notice] = nil`
| * | | | | | | | Merge branch 'es-module-copy-to-clipboard' into 'master'Tim Zallmann2017-11-304-75/+75
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Refactor 'copy-to-clipboard.js' See merge request gitlab-org/gitlab-ce!15531
| | * | | | | | | clarify safari browser supportMike Greiling2017-11-281-4/+4
| | | | | | | | |
| | * | | | | | | move copy_to_clipboard to behaviors directory as it is needed on all pagesMike Greiling2017-11-283-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci-skip]
| | * | | | | | | fix eslint errorsMike Greiling2017-11-281-33/+32
| | | | | | | | |
| | * | | | | | | remove vendored clipboard library in favor of package.json entryMike Greiling2017-11-281-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch '40629-icon-styles' into 'master'Annabel Dunstone Gray2017-11-291-28/+14
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix icon colors in commit list Closes #40629 See merge request gitlab-org/gitlab-ce!15640
| | * | | | | | | fix icon colors in commit list40629-icon-stylesSimon Knox2017-11-291-28/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is not a great way to do this. But using currentColor for these means we are competing with this selector: ul.content-list li a
| * | | | | | | | Merge branch 'bvl-double-fork' into 'master'Phil Hughes2017-11-292-16/+27
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to an already forked project if it exists See merge request gitlab-org/gitlab-ce!15653
| | * | | | | | | | Redirect to an already forked project if it existsBob Van Landuyt2017-11-292-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the we would try to `POST` to the project path, which would result in a 404, because that `POST` is not supported. By changing this back to a normal link, not not handled in JS, we can immeadiatly redirect.
| * | | | | | | | | Merge branch 'remove-mr-diff-serialised-columns' into 'master'Yorick Peterse2017-11-293-85/+23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove serialised diff and commit columns Closes #39533 See merge request gitlab-org/gitlab-ce!15582
| | * | | | | | | | | Remove serialised diff and commit columnsSean McGivern2017-11-283-85/+23
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The st_commits and st_diffs columns on merge_request_diffs historically held the YAML-serialised data for a merge request diff, in a variety of formats. Since 9.5, these have been migrated in the background to two new tables: merge_request_diff_commits and merge_request_diff_files. That has the advantage that we can actually query the data (for instance, to find out how many commits we've stored), and that it can't be in a variety of formats, but must match the new schema. This is the final step of that journey, where we drop those columns and remove all references to them. This is a breaking change to the importer, because we can no longer import diffs created in the old format, and we cannot guarantee the export will be in the new format unless it was generated after this commit.