diff options
| author | Vitaliy @blackst0ne Klachkov <blackst0ne.ru@gmail.com> | 2017-11-07 15:32:51 +1100 |
|---|---|---|
| committer | Vitaliy @blackst0ne Klachkov <blackst0ne.ru@gmail.com> | 2017-11-07 15:32:51 +1100 |
| commit | e2b28d252654b98b332c060710f82892d25ed138 (patch) | |
| tree | d3e2f4284acee95a63c0e4ea15b64a32f6c6cc23 | |
| parent | df7eaa85cb5fe9f2d2d42a226fc7f7bf8c19b775 (diff) | |
| download | gitlab-ce-feature_change_sort_refs.tar.gz | |
Change tags order in refs dropdownfeature_change_sort_refs
| -rw-r--r-- | app/views/shared/_ref_switcher.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/feature_change_sort_refs.yml | 5 | ||||
| -rw-r--r-- | spec/controllers/projects_controller_spec.rb | 11 |
3 files changed, 12 insertions, 6 deletions
diff --git a/app/views/shared/_ref_switcher.html.haml b/app/views/shared/_ref_switcher.html.haml index 6d7c9633913..6356e9f92cb 100644 --- a/app/views/shared/_ref_switcher.html.haml +++ b/app/views/shared/_ref_switcher.html.haml @@ -7,7 +7,7 @@ - @options && @options.each do |key, value| = hidden_field_tag key, value, id: nil .dropdown - = dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_project_path(@project), field_name: 'ref', submit_form_on_click: true, visit: true }, { toggle_class: "js-project-refs-dropdown" } + = dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_project_path(@project, sort: 'updated_desc'), field_name: 'ref', submit_form_on_click: true, visit: true }, { toggle_class: "js-project-refs-dropdown" } .dropdown-menu.dropdown-menu-selectable.git-revision-dropdown.dropdown-menu-paging{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) } .dropdown-page-one = dropdown_title _("Switch branch/tag") diff --git a/changelogs/unreleased/feature_change_sort_refs.yml b/changelogs/unreleased/feature_change_sort_refs.yml new file mode 100644 index 00000000000..2dccd87d228 --- /dev/null +++ b/changelogs/unreleased/feature_change_sort_refs.yml @@ -0,0 +1,5 @@ +--- +title: Change tags order in refs dropdown +merge_request: 15235 +author: Vitaliy @blackst0ne Klachkov +type: changed diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index b1d7157e447..e7ab714c550 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -503,13 +503,14 @@ describe ProjectsController do describe "GET refs" do let(:public_project) { create(:project, :public, :repository) } - it "gets a list of branches and tags" do - get :refs, namespace_id: public_project.namespace, id: public_project + it 'gets a list of branches and tags' do + get :refs, namespace_id: public_project.namespace, id: public_project, sort: 'updated_desc' parsed_body = JSON.parse(response.body) - expect(parsed_body["Branches"]).to include("master") - expect(parsed_body["Tags"]).to include("v1.0.0") - expect(parsed_body["Commits"]).to be_nil + expect(parsed_body['Branches']).to include('master') + expect(parsed_body['Tags'].first).to eq('v1.1.0') + expect(parsed_body['Tags'].last).to eq('v1.0.0') + expect(parsed_body['Commits']).to be_nil end it "gets a list of branches, tags and commits" do |