summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Remove duplication of implementationsZ.J. van de Weg2016-11-172-2/+3
| * | | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-172-0/+65
| * | | | fixup! issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-171-1/+1
| * | | | issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-172-1/+7
| * | | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-172-0/+13
* | | | | Merge branch '23205-information-about-environments-build-page' into 'master' Fatih Acet2016-11-181-0/+30
|\ \ \ \ \
| * | | | | Fix tests and add has_environment?Kamil Trzcinski2016-11-171-3/+7
| * | | | | Improve specs and add missing cases that were not supportedKamil Trzcinski2016-11-171-2/+18
| * | | | | Expose `last_deployment` on `Ci::Builds` [ci skip]Kamil Trzcinski2016-11-081-3/+7
| * | | | | Add switch statement & last_deployment methodAnnabel Dunstone Gray2016-11-081-0/+6
* | | | | | Merge branch 'pass-correct-tag-target-to-post-receive' into 'master' Sean McGivern2016-11-181-3/+10
|\ \ \ \ \ \
| * | | | | | Pass correct tag target to post-receive hook when creating tag via UIpass-correct-tag-target-to-post-receiveAdam Niedzielski2016-11-181-3/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'issue_13232' into 'master' Sean McGivern2016-11-181-35/+79
|\ \ \ \ \ \
| * | | | | | Add JIRA remotelinks and prevent duplicated closing messagesFelipe Artur2016-11-181-35/+79
* | | | | | | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-182-56/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | refactor events facade so it uses separate classes and refactor query stuffJames Lopez2016-11-171-9/+8
| * | | | | | Renamed pipeline column and fixed permissions for builds in events controllerJames Lopez2016-11-171-1/+1
| * | | | | | Added test events specs and logic. Also fixed some SQL and refactored the pip...James Lopez2016-11-171-1/+1
| * | | | | | add pipeline id to merge request metrics table. Also, updated the pipeline wo...James Lopez2016-11-172-1/+2
| * | | | | | Started refactoring stuff to add events to cycle analyticsJames Lopez2016-11-171-48/+1
* | | | | | | Merge branch 'feature/subscribe-to-group-level-labels' into 'master' Sean McGivern2016-11-174-21/+54
|\ \ \ \ \ \ \
| * | | | | | | Allow users to subscribe to a group label at group or project levelDouglas Barbosa Alexandre2016-11-171-4/+23
| * | | | | | | Allow subscriptions to be created without a projectDouglas Barbosa Alexandre2016-11-172-10/+17
| * | | | | | | Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-172-18/+16
| * | | | | | | Refactoring Subscribable concern to accept a projectDouglas Barbosa Alexandre2016-11-172-17/+23
| * | | | | | | Add unique index to subscriptions on subscribable and user and projectDouglas Barbosa Alexandre2016-11-171-2/+2
| * | | | | | | Add project_id to subscriptionsDouglas Barbosa Alexandre2016-11-171-0/+3
* | | | | | | | Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-172-0/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-167-18/+53
| |\ \ \ \ \ \ \
| * | | | | | | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-162-0/+13
* | | | | | | | | Merge branch 'jira_service_simplify' into 'master' Sean McGivern2016-11-171-10/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | simplify url generationJarka Kadlecova2016-11-051-10/+8
* | | | | | | | | Merge branch 'feature/environment-teardown-when-branch-deleted' into 'master' Kamil Trzciński2016-11-173-16/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add specs for environments recently updated on branchGrzegorz Bizon2016-11-161-1/+1
| * | | | | | | | | Refactor methods for environments in project modelGrzegorz Bizon2016-11-162-6/+13
| * | | | | | | | | Improve readability in project model for environmentsGrzegorz Bizon2016-11-161-2/+2