summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-project-team-helpers' into 'master' Sean McGivern2016-11-222-0/+17
|\
| * Add shortcuts for adding users to a project team with a specific rolers-project-team-helpersRobert Speicher2016-11-182-0/+17
* | Merge branch 'revert-a0d5bb0b' into 'master' Achilleas Pipinellis2016-11-221-3/+3
|\ \
| * | Change documentation link in JIRA servicerevert-a0d5bb0bAchilleas Pipinellis2016-11-221-3/+3
* | | Merge branch 'zj-mattermost-command-help-message' into 'master' Fatih Acet2016-11-221-7/+0
|\ \ \
| * | | Improve the mattermost help boxZ.J. van de Weg2016-11-211-7/+0
* | | | Merge branch 'fix-failed-email-for-external-jobs' into 'master' Kamil Trzciński2016-11-221-3/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Move has_trace? to CommitStatus than GenericCommitStatusLin Jen-Shin2016-11-222-7/+7
| * | | Use has_trace? instead of case switch, feedback:Lin Jen-Shin2016-11-211-0/+4
* | | | Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable2016-11-211-1/+9
|\ \ \ \
| * | | | Introduce deploy command that allows to start deployment from one environment...chatops-deploy-commandKamil Trzcinski2016-11-211-2/+2
| * | | | Add deploy chat command [ci skip]Kamil Trzcinski2016-11-211-1/+9
| | |/ / | |/| |
* | | | Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński2016-11-211-0/+4
|\ \ \ \
| * | | | Add Gitlab::Ci::Build::Credentials module with build credentials abstractionTomasz Maczukin2016-11-211-8/+1
| * | | | Send credentials array with build dataTomasz Maczukin2016-11-211-0/+11
* | | | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-211-2/+4
|\ \ \ \ \
| * | | | | Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-211-2/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-213-191/+221
|\ \ \ \ \
| * | | | | Refactor cache refreshing/expiringYorick Peterse2016-11-212-185/+213
| * | | | | Use File.exist? to check if a repository existsYorick Peterse2016-11-211-5/+7
| * | | | | Unify detecting of special repository filesYorick Peterse2016-11-212-16/+16
| |/ / / /
* | | | | Merge branch 'issue_24303' into 'master' Sean McGivern2016-11-213-15/+18
|\ \ \ \ \
| * | | | | Allow JIRA references for project snippetsissue_24303Felipe Artur2016-11-213-15/+18
* | | | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-211-0/+6
|\ \ \ \ \ \
| * | | | | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-211-4/+3
| * | | | | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-211-1/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '24616-mr-shows-the-build-for-this-merge-request-failed-although...Kamil Trzciński2016-11-211-1/+1
|\ \ \ \ \ \
| * | | | | | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-211-1/+1
* | | | | | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-211-1/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-211-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ee-870-backport' into 'master' Sean McGivern2016-11-211-0/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-181-0/+11
* | | | | | Merge branch 'issue_5541' into 'master' Sean McGivern2016-11-212-24/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-182-24/+20
* | | | | | Merge branch 'remove-unnecessary-self-from-user-model' into 'master' Rémy Coutable2016-11-211-54/+53
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove unnecessary self from user modelSemyon Pupkov2016-11-191-54/+53
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-slack-pipeline-event' into 'master' Kamil Trzciński2016-11-191-4/+3
|\ \ \ \ \
| * | | | | Fix pipeline author for Slack and use pipeline idLin Jen-Shin2016-11-161-4/+3
* | | | | | Merge branch 'feature/precalculate-authorized-projects' into 'master' Douwe Maan2016-11-187-47/+102
|\ \ \ \ \ \
| * | | | | | Precalculate user's authorized projects in databaseAhmad Sherif2016-11-187-47/+102
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński2016-11-185-2/+88
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Rename mattermost_command to mattermost_slash_commandszj-slash-commands-mattermostKamil Trzcinski2016-11-183-4/+4
| * | | | | Fix typosZ.J. van de Weg2016-11-181-1/+1
| * | | | | Return a consistent not found messageZ.J. van de Weg2016-11-181-1/+1
| * | | | | Projects have chat servicesZ.J. van de Weg2016-11-181-0/+1
| * | | | | Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-1711-63/+105
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | More refactoring, push present to base commandZ.J. van de Weg2016-11-172-5/+5
| * | | | | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-173-13/+23
| * | | | | First steps on refactoring Mattermost Slash commandsZ.J. van de Weg2016-11-171-23/+2
| * | | | | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-174-12/+36