summaryrefslogtreecommitdiff
path: root/app/views/projects/branches
Commit message (Collapse)AuthorAgeFilesLines
* Hides merge request button on branches pagebranches-mr-button-permissionsPhil Hughes2016-09-021-2/+3
| | | | | | If user does not have the correct permissions, the merge request button is hidden Closes #21805
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-241-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | artifacts-from-ref-and-build-name * upstream/master: (192 commits) Added CHANGELOG Added unfold test to parallel and added 'diff discussion' context Fix Spinach branches spec Better first match on this MR also Change merge_error column from string to text type Fix typo in gitlab_flow.md entities: make Environment inherit EnvironmentBasic Updated to optimized specs from !5864 Added 'with an unfolded line should not allow commenting' scenario (line 125) Added addtional 'renderable' validator to check 'data-note-type' attr exists Allow passing an index to selectRowAtIndex Fixed enter key in search input not working Fix file links on project page Files view Fix incorrect "stopped impersonation" log message 8.11 is released, long live 8.12 Also check if Akismet is enabled, before showing the `Submit as spam` button. fix location of markdown help location Fix for update 8.10-to-8.11.md doc. Appease the linter. Add Ruby 2.3 upgrade notes. ...
| * Fix branch title trailing space on hoverClement Ho2016-08-161-2/+2
| |
* | Aggressively merge views, feedback:Lin Jen-Shin2016-08-241-9/+1
| | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_14347679 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_14347470
* | Use partials for downloading artifacts buttonLin Jen-Shin2016-08-171-21/+9
| |
* | Rename to latest_succeeded, feedback:Lin Jen-Shin2016-08-161-1/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13908017
* | Add unclickable state to running build artifactsAnnabel Dunstone2016-08-151-1/+1
| |
* | Fixed bug when a pipeline for latest SHA does not existKamil Trzcinski2016-08-151-1/+1
| |
* | Show latest pipeline status if what provided artifacts aren't latestLin Jen-Shin2016-08-111-1/+4
| |
* | Make Pipeline.latest_successful_for return the recordLin Jen-Shin2016-08-111-1/+1
| |
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-102-19/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | artifacts-from-ref-and-build-name * upstream/master: (516 commits) Rename `run` task helper method to prevent conflict with StateMachine Add a method in Project to return a cached value of total count of projects Add Changelog entry for Grape upgrade [ci skip] Fix Grape tests. Retain old behavior Update Grape from 0.13.0 to 0.15.0. adds second batch of tests changed to active tense fixes part1 of files to start using active tense Clarify the features for generating default label sets Update tree view to sort folders with submodules Memoize CI config node validator to prevent leaks fix MR source project assignment remove offending empty line Rails prefers require_dependency so that it won't require twice: use Unix line endings for API documentation use long options for curl examples in API documentation (!5703) Prefixes removed branches name with PR number when importing PR from GH Update CHANGELOG Remove SHA suffix for removed branches name when importing PR from GH add linting script for documentation ...
| * Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-281-1/+1
| |
| * Fix the title of the toggle dropdown buttonHerminio Torres2016-07-281-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before when you choose the way of `sort` instead it display the title correctly it was just apply the humanize helper in sort value. E.g. When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title. Change the implementation of the `link_to` `filter_branches_path` - Change the value of the `params[:sort]` in `link_to`. E.g. instead of using `'recently_updated'` is now using `sort_value_recently_updated`. - Change the values of the case in the `branches_sorted_by` method for the values it receives in the `params[:sort]` that are: `nil`, `'name'`, `'updated_desc'`, `'updated_asc'`.
| * Make branches sortable without push permission (!5462)winniehell2016-07-261-20/+23
| |
| * Merge branch 'filter-branch-by-name' into 'master' Douwe Maan2016-07-251-8/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Users can filter branches by name on project branches page This MR aims to solve #18674 by adding the possibility to filter project branches by name ![Screen_Shot_2016-07-07_at_17.21.25](/uploads/b674765d2b1cb8a121c2101715a4568b/Screen_Shot_2016-07-07_at_17.21.25.png) See merge request !5144
| | * Merge branch 'master' into filter-branch-by-nametiagonbotelho2016-07-221-1/+1
| | |\
| | * | refactors the search to enable users to filter and sort branches at thetiagonbotelho2016-07-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same time and writes tests accordingly changes schema.db removes duplicate field inside CHANGELOG fix db/schema
| | * | implements the basic filter functionalitytiagonbotelho2016-07-191-8/+13
| | | |
| * | | Revert "Merge branch ↵Alejandro Rodríguez2016-07-241-1/+1
| | |/ | |/| | | | | | | | | | '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" This reverts merge request !5375
| * | Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-211-1/+1
| |/
* | Merge branch 'artifacts-from-ref-and-build-name-api' into ↵Lin Jen-Shin2016-07-211-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | artifacts-from-ref-and-build-name * artifacts-from-ref-and-build-name-api: (384 commits) Add API documentation for downloading the latest successful build Since it's too hard to use JOIN with Rails... feedback: Workaround MySQL with INNER JOIN: Just put setup directly in the test, feedback: Cleanup the use of let, feedback: Lose unneeded instance variables and variables, feedback: Add link to user profile to commit avatar (!5163) It's not longer than 80 chars Make sure there's a build Use the same logic, it should specify that it's not logged in Use 'when logging as guest' for context, feedback: Cleanup that a bit Refactor service settings view Fix a problem with processing a pipeline where stage only has manual actions Rename user2 to reporter_user Should check against `authorize_read_builds!` A CHANGELOG entry Don't show other actions of the same name Use limit parameter rather than hardcoded value Reuse those two methods ...
* | Link to pipeline instead of source tree, feedback:Lin Jen-Shin2016-07-191-1/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13164795
* | Rename latest_success* to latest_successful:Lin Jen-Shin2016-07-191-2/+2
| | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13164642
* | Actually should use tree pathLin Jen-Shin2016-07-181-1/+1
| |
* | Links to search_namespace_project_artifacts_path insteadLin Jen-Shin2016-07-181-1/+1
| |
* | Show notice if builds are not from latest pipelineLin Jen-Shin2016-07-181-14/+18
| |
* | Should be branch.name, not root refLin Jen-Shin2016-07-181-1/+1
| |
* | Use Project#latest_success_builds_forLin Jen-Shin2016-07-181-1/+1
| |
* | Add artifacts download button on project page and branches pageAnnabel Dunstone2016-07-171-0/+15
|/
* Remove unnecessary parenscode_style_fixesValery Sizov2016-06-301-2/+2
|
* Fixed size of buttons in branches listbranch-buttons-sizePhil Hughes2016-06-171-3/+3
| | | | Closes #18677
* Use responsive top-area on project branches and tags pagesDmitriy Zaporozhets2016-06-081-22/+21
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove unnecessary icons from buttonsdz-improve-ui-consistencyDmitriy Zaporozhets2016-06-081-2/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Finish styling sub navAnnabel Dunstone2016-06-071-29/+32
|
* Put project Files and Commits tabs under Code tabDmitriy Zaporozhets2016-06-031-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove header title from project pagesDmitriy Zaporozhets2016-05-262-2/+0
| | | | | | | With new navigation design it makes no sense to duplicate title in the header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Start builds redesignAnnabel Dunstone2016-05-041-1/+1
|
* Merge branch 'dropdown-right-align' into 'master' Jacob Schatz2016-03-231-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Dropdown alignment Hopefully the JS will stop this happening in future as well! Closes #14386 ![Screen_Shot_2016-03-18_at_12.54.32](/uploads/d11b51d3577df3a19b8b3a0fd7b69788/Screen_Shot_2016-03-18_at_12.54.32.png) See merge request !3298
| * Removed dropdown JS to align instead favours HTML classdropdown-right-alignPhil Hughes2016-03-221-1/+1
| |
* | change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltipArinde Eniola2016-03-201-2/+2
|/
* Cache & flush tag/branch countsYorick Peterse2016-03-081-1/+1
| | | | | | | The methods used for this are Repository#tag_count and Repository#branch_count which cache their output in Redis as well as memoizing it in an instance variable. Both methods have a corresponding methods/hooks to flush the caches at the right time.
* Removed sorted text from dropdownsPhil Hughes2016-01-281-1/+1
| | | | Closes #12796
* Replace strong by span for .item-title elementsfix-alignment-issueRémy Coutable2016-01-151-1/+1
|
* Streamline item titles to use a single class, and add back strong tagsRémy Coutable2016-01-151-2/+2
|
* Improve the consistency of commit titles, branch names, tag names, issue/MR ↵fix/titles-weightRémy Coutable2016-01-141-1/+1
| | | | titles, on their respective project pages
* Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+15
|\ | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
| * Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-033-3/+3
| |\
| * \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-121-2/+2
| |\ \
| * | | Refactor for style issuesJeff Stubler2015-11-111-5/+6
| | | |
| * | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+14
| | | |