summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add empty koding state; check permissions for project buttonsAnnabel Dunstone Gray2016-12-173-13/+11
* Move all project buttons to headerAnnabel Dunstone Gray2016-12-179-33/+29
* Move access request buttons to project headerAnnabel Dunstone Gray2016-12-174-18/+23
* 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
| * | | Fix MembersHelperDouglas Barbosa Alexandre2016-12-161-11/+11
| * | | Adds sort dropdown for group membersNur Rony2016-12-168-26/+127
* | | | Merge branch 'fix/keep-compatility-ruby-21' into 'master' Stan Hu2016-12-161-1/+1
|\ \ \ \
| * | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1fix/keep-compatility-ruby-21Douglas Barbosa Alexandre2016-12-161-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-163-54/+76
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-16291-1199/+2177
| |\ \ \
| * | | | BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov2016-12-151-0/+3
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-1423-56/+61
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-14345-3337/+5077
| |\ \ \ \ \
| * | | | | | Handling OAuth2 errorsValery Sizov2016-12-091-1/+1
View Lorry Controller Status