summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-194-12/+34
|\
| * Fix extra spacing in all rgba methods in status filefix/detailed-status-groupsFilipa Lacerda2016-12-171-8/+8
| * Improve spacing and fixes manual status colorFilipa Lacerda2016-12-172-7/+7
| * Add `ci-manual` status CSS with darkest gray colorGrzegorz Bizon2016-12-171-0/+13
| * Fix CI/CD statuses actions' CSS on pipeline graphsGrzegorz Bizon2016-12-171-1/+1
| * Adds CSSFilipa Lacerda2016-12-161-0/+8
| * Make CI/CD detailed status group concept explicitGrzegorz Bizon2016-12-161-2/+3
* | Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-197-2/+63
|\ \
| * \ Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-18919-8065/+15838
| |\ \
| * | | Refactored JSLuke "Jared" Bennett2016-11-085-41/+50
| * | | Allow to use Dockerfile templatesKamil Trzcinski2016-11-086-2/+54
* | | | Merge branch 'correct-slack-slash-commands-pretty-path' into 'master' Kamil Trzciński2016-12-181-3/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Correct slack slash commands pretty pathcorrect-slack-slash-commands-pretty-pathLuke "Jared" Bennett2016-12-151-3/+2
* | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-1716-39/+39
|\ \ \ \
| * | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-1616-39/+39
| | |_|/ | |/| |
* | | | Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-176-12/+79
|\ \ \ \
| * | | | Change closes issues reference text on MergeRequest#merge_commit_message to m...Gabriel Gizotti2016-12-161-2/+1
| * | | | add eslint disable prefix for prefer-arrow-callback rule on header of merge_r...Gabriel Gizotti2016-12-161-1/+1
| * | | | add guard clause to MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-9/+6
| * | | | add js prefix to classes used to toggle description on commit message in merg...Gabriel Gizotti2016-12-162-10/+10
| * | | | Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-162-11/+11
| * | | | Unify commit message listeners in one functionGabriel Gizotti2016-12-161-11/+6
| * | | | better text for mentioned but not closedGabriel Gizotti2016-12-161-1/+1
| * | | | add mentioned but not closed message to the same line as closes issueswqGabriel Gizotti2016-12-161-13/+14
| * | | | extract duplicate logic into a variable on _commit_message_containerGabriel Gizotti2016-12-161-2/+3
| * | | | Better `Closes issues` text for MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-1/+2
| * | | | move javascript code from _commit_message_container view to javascripts/merge...Gabriel Gizotti2016-12-162-21/+26
| * | | | backend completely drives creation of merge commit messageGabriel Gizotti2016-12-164-26/+23
| * | | | Remove unnecessary code from MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-4/+2
| * | | | only render MR description toggle javascript if description is availableGabriel Gizotti2016-12-161-20/+19
| * | | | keep branch being merged, MR title and MR reference in merge commit message w...Gabriel Gizotti2016-12-161-2/+8
| * | | | Add toggle links for using default message and description on change merge co...Gabriel Gizotti2016-12-162-0/+29
| * | | | shorter lines on MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-2/+9
| * | | | only look for issues mentioned on description on MergeRequest#issues_mentione...Gabriel Gizotti2016-12-161-2/+4
| * | | | better mentioned but not closing message and iconGabriel Gizotti2016-12-162-9/+2
| * | | | diplays mentioned but not merged message on MR show pageGabriel Gizotti2016-12-162-0/+20
| * | | | introduce MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-0/+16
| * | | | Remove whole description from #merge_commit_message and add add closed issuesGabriel Gizotti2016-12-161-1/+2
* | | | | Merge branch '23573-sort-functionality-for-project-member' into 'master' Douglas Barbosa Alexandre2016-12-1710-13/+156
|\ \ \ \ \
| * | | | | Fix query in Projects::ProjectMembersController to fetch members23573-sort-functionality-for-project-memberDouglas Barbosa Alexandre2016-12-161-2/+2
| * | | | | Improve test for sort dropdown on members pageNur Rony2016-12-161-1/+1
| * | | | | Fix sort dropdown alignmentNur Rony2016-12-161-2/+2
| * | | | | Undo changes on members search button stylesheetDouglas Barbosa Alexandre2016-12-161-16/+15
| * | | | | Remove unused id from shared members sort dropdownDouglas Barbosa Alexandre2016-12-161-1/+1
| * | | | | Fix sort functionality on project/group members to return invited usersDouglas Barbosa Alexandre2016-12-161-4/+15
| * | | | | Refactor MembersHelper#filter_group_project_member_pathDouglas Barbosa Alexandre2016-12-161-5/+1
| * | | | | Remove unnecessary curly braces from sort dropdown partialDouglas Barbosa Alexandre2016-12-161-1/+1
| * | | | | Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre2016-12-162-3/+3
| * | | | | Add option to sort group/project members by access levelDouglas Barbosa Alexandre2016-12-162-0/+20
| * | | | | Fix sort functionality for group/project membersDouglas Barbosa Alexandre2016-12-163-12/+28
View Lorry Controller Status