summaryrefslogtreecommitdiff
path: root/app/views/shared
Commit message (Collapse)AuthorAgeFilesLines
* Remove common_vue bundleMike Greiling2018-03-061-1/+0
|
* Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-066-23/+16
|\ | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'Robert Speicher2018-03-051-7/+12
| |\ | | | | | | | | | | | | Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342
| | * CI/CD-only projects FEEric Eastwood2018-03-051-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot
| * | Merge branch 'dz-use-less-deprecated-methods' into 'master'Douwe Maan2018-03-054-4/+4
| |\ \ | | | | | | | | | | | | | | | | Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
| | * | Replace deprecated name_with_namespace with full_name in app/viewsDmitriy Zaporozhets2018-03-054-4/+4
| | |/ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | removed show_new_branch_formPhil Hughes2018-03-021-6/+0
| | |
| * | removed helper methodsPhil Hughes2018-03-021-6/+0
| |/
* | Bring one group board to CEFelipe Artur2018-03-033-2/+6
|/
* Ignore InlineJavaScript linter in existing script tag locations.winh-inline-script-linterConnor Shea2018-02-283-0/+5
|
* remove a bunch of superfluous common_vue bundlesdispatcher-cleanupMike Greiling2018-02-282-4/+0
|
* Render MR Notes with Vue with behind a cookieFatih Acet2018-02-281-3/+4
|
* Remove snippet bundle webpack entry pointClement Ho2018-02-271-1/+0
|
* Merge branch 'remove-sidebar-bundle' into 'master'Jacob Schatz2018-02-271-1/+0
|\ | | | | | | | | Remove sidebar bundle webpack entry point See merge request gitlab-org/gitlab-ce!17343
| * Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundleClement Ho2018-02-231-1/+0
| |\
| * | Remove sidebar bundle webpack entry pointClement Ho2018-02-231-1/+0
| | |
* | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-271-3/+5
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Move the #update action from Project/Member controllers to the ↵Rémy Coutable2018-02-271-0/+4
| |/ |/| | | | | | | | | MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-232-3/+3
|\ \ | |/ | | | | # Conflicts: # config/webpack.config.js
| * Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-231-2/+2
| |\ | | | | | | | | | | | | Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208
| | * Port `read_cross_project` ability from EEBob Van Landuyt2018-02-221-2/+2
| | |
| * | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood2018-02-2212-31/+23
| |\ \ | | |/
| * | Move button list logic to project presenterOswaldo Ferreira2018-02-201-1/+1
| | |
* | | Resolved conflicts with masterConstance Okoghenun2018-02-213-17/+9
|\ \ \ | | |/ | |/|
| * | Rest of Dispatcher RefactorJacob Schatz2018-02-211-1/+0
| | |
| * | #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-211-15/+8
| | |
| * | Merge branch '35418-remove-underline-for-avatar' into 'master'Clement Ho2018-02-211-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove underline for avatar" Closes #35418 See merge request gitlab-org/gitlab-ce!17219
| | * | 35418 - remove avatar underlineKen2018-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | 35418 - update changelog
* | | | Resolved conflicts with masterConstance Okoghenun2018-02-202-3/+3
|\ \ \ \ | |/ / /
| * | | Chart.html.haml refactorJacob Schatz2018-02-192-3/+3
| |/ /
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Constance Okoghenun2018-02-161-3/+3
|\ \ \ | |/ / | | | | | | boards-bundle-refactor
| * | Merge branch ↵Rémy Coutable2018-02-151-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40623-fix-404-when-listing-archived-projects-in-a-group-where-all-projects-have-been-archived' into 'master' Resolve "404 when listing archived projects in a group where all projects have been archived" Closes #40623 See merge request gitlab-org/gitlab-ce!17077
| | * | Change group_children_path to filter_groups_path like for the sort order filterAshley Dumaine2018-02-151-3/+3
| | |/ | | | | | | | | | Signed-off-by: Ashley Dumaine <adumaine@datto.com>
* | | Refactored use of boards/boards_bundle.js, created a dipatcher importConstance Okoghenun2018-02-151-1/+0
|/ /
* | Retrieve project creator's avatar by creator, not creator#email.Andreas Brandl2018-02-131-1/+1
| |
* | Use more specific #avatar_icon_for_email.Andreas Brandl2018-02-131-1/+1
| |
* | Use more specific #avatar_icon_for_user.Andreas Brandl2018-02-136-6/+6
|/ | | | | Whenever we already deal with a User object, let's use the more specific method avatar_icon_for_user.
* Fix warning messages for promoting labels and milestonesJose Ivan Vargas2018-02-122-2/+2
|
* Translate issuable sidebar34416-issue-i18nJarka Kadlecová2018-02-075-42/+46
|
* Fix N+1 query problem for snippets dashboard.40755-snippets-author-n+1Andreas Brandl2018-02-071-1/+1
| | | | Closes #40755.
* Merge branch '39550-group-labels-redesign' into 'master'Tim Zallmann2018-02-063-24/+51
|\ | | | | | | | | | | | | Resolve "Group label list page redesign" Closes #39550 See merge request gitlab-org/gitlab-ce!16592
| * Use sprite_icon and variables39550-group-labels-redesignAnnabel Dunstone Gray2018-02-051-1/+1
| |
| * Fix labels specsAnnabel Dunstone Gray2018-01-302-3/+3
| |
| * Add modal for label deletionAnnabel Dunstone Gray2018-01-292-3/+26
| |
| * Change delete notice; update mobile stylesAnnabel Dunstone Gray2018-01-291-11/+11
| |
| * Start redesign of group labels pageAnnabel Dunstone Gray2018-01-292-21/+25
| |
* | Merge branch 'fix/adjust-button-group-width-on-mobile' into 'master'Clement Ho2018-02-024-14/+17
|\ \ | |/ |/| | | | | Improve top area navigation See merge request gitlab-org/gitlab-ce!16726
| * Improve top area navigationGeorge Tsiolis2018-02-024-14/+17
| | | | | | | | | | | | - Change button group width on mobile to 100% - Added scrolling container to activity top area secondary navigation - Added bottom border to top-area nav-links to separate them from nav-controls
* | Create merge request specqa_78_create_merge_requestFelipe Artur2018-01-263-3/+3
|/
* Merge branch 'winh-delete-milestone-modal' into 'master'Phil Hughes2018-01-251-3/+10
|\ | | | | | | | | | | | | Add modal for deleting a milestone Closes #41314 See merge request gitlab-org/gitlab-ce!16229