summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-174-7/+7
|\
| * Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-164-7/+7
* | Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-171-5/+29
|\ \
| * | Change closes issues reference text on MergeRequest#merge_commit_message to m...Gabriel Gizotti2016-12-161-2/+1
| * | add guard clause to MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-9/+6
| * | Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-161-6/+8
| * | Better `Closes issues` text for MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-1/+2
| * | backend completely drives creation of merge commit messageGabriel Gizotti2016-12-161-1/+2
| * | Remove unnecessary code from MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-4/+2
| * | 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
| * | 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
* | | Fix sort functionality on project/group members to return invited usersDouglas Barbosa Alexandre2016-12-161-4/+15
* | | Add option to sort group/project members by access levelDouglas Barbosa Alexandre2016-12-161-0/+2
* | | Fix sort functionality for group/project membersDouglas Barbosa Alexandre2016-12-162-2/+24
| |/ |/|
* | Merge branch 'expose-deployment-variables' into 'master' 25743-clean-up-css-for-project-alerts-and-flash-notificationsKamil Trzciński2016-12-164-1/+22
|\ \
| * | Pass variables from deployment project services to CI runnerexpose-deployment-variablesAdam Niedzielski2016-12-164-1/+22
* | | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-161-0/+2
|\ \ \
| * | | Add a `scopes` column to the `personal_access_tokens` tableTimothy Andrew2016-12-161-0/+2
| | |/ | |/|
* | | Merge branch 'issue_22269' into 'master' Kamil Trzciński2016-12-1614-62/+116
|\ \ \ | |_|/ |/| |
| * | Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-157-155/+165
| * | Mattermost Notifications ServiceFelipe Artur2016-12-1514-171/+215
* | | Merge branch 'dz-nested-groups-title-ui' into 'master' Sean McGivern2016-12-162-1/+14
|\ \ \ | |_|/ |/| |
| * | Refactor Namespace#parents methoddz-nested-groups-title-uiDmitriy Zaporozhets2016-12-151-11/+1
| * | Use full_name for Group in UIDmitriy Zaporozhets2016-12-131-1/+1
| * | Add parents method to NamespaceDmitriy Zaporozhets2016-12-131-5/+20
| * | Show full path for nested groups at dashboard groups listDmitriy Zaporozhets2016-12-131-0/+8
* | | Merge branch 'show-commit-status-from-latest-pipeline' into 'master' Grzegorz Bizon2016-12-152-9/+21
|\ \ \
| * | | Don't call anything on a block, use simple ifLin Jen-Shin2016-12-151-4/+6
| * | | Introduce latest_status and add a few testsLin Jen-Shin2016-12-142-2/+6
| * | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-l...Lin Jen-Shin2016-12-144-6/+27
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into show-commit-status-from-l...Lin Jen-Shin2016-12-1440-440/+491
| |\ \ \ \
| * | | | | Rename latest_for to latest, feedback:Lin Jen-Shin2016-11-242-9/+5
| * | | | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-l...Lin Jen-Shin2016-11-2422-376/+379
| |\ \ \ \ \
| * | | | | | Filter against status first, otherwise we can'tLin Jen-Shin2016-11-221-1/+1
| * | | | | | Use latest_for in latest_successful_forLin Jen-Shin2016-11-211-1/+1
| * | | | | | Still use compound pipeline status, but group byLin Jen-Shin2016-11-212-10/+14
| * | | | | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-l...Lin Jen-Shin2016-11-2138-380/+810
| |\ \ \ \ \ \
| * | | | | | | Show commit status from latest pipelineLin Jen-Shin2016-11-082-8/+14
* | | | | | | | Merge branch '22864-add-clean-environment-name' into 'master' Kamil Trzciński2016-12-152-2/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | Add $CI_ENVIRONMENT_NAME and $CI_ENVIRONMENT_SLUGNick Thomas2016-12-152-2/+25
| * | | | | | | | Add an environment slugNick Thomas2016-12-151-0/+50
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jej-24637-move-issue-visible_to_user-to-finder' into 'security' Sean McGivern2016-12-152-56/+1
* | | | | | | | Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-152-19/+2
|/ / / / / / /
* | | | | | | Merge branch 'seed-runner-token' into 'master' Kamil Trzciński2016-12-151-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Allow users to seed the initial runner registration token using an environmen...DJ Mountney2016-12-011-0/+4
* | | | | | | | Merge branch 'fix-slack-pipeline-message-by-api' into 'master' Kamil Trzciński2016-12-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Slack pipeline message by APIfix-slack-pipeline-message-by-apiLin Jen-Shin2016-12-131-1/+1
* | | | | | | | | Merge branch '22849-ci-build-ref-slug' into 'master' Kamil Trzciński2016-12-151-0/+12
|\ \ \ \ \ \ \ \ \