summaryrefslogtreecommitdiff
path: root/app
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 'fix-Build-timeFor' into 'master' Alfredo Sumaran2016-11-191-1/+1
|\ \
| * | Fix typo in Build page JavaScript (!7563)winniehell2016-11-181-1/+1
* | | Merge branch '24652-fix-timeago-not-rendering-in-repository-view' into 'master' Fatih Acet2016-11-181-2/+2
|\ \ \
| * | | fix broken ajax for large repository trees (regression caused in !7208)24652-fix-timeago-not-rendering-in-repository-viewMike Greiling2016-11-181-2/+2
* | | | Merge branch '24658-makes-compare-links-easily-clickable' into 'master' Fatih Acet2016-11-181-0/+1
|\ \ \ \
| * | | | makes compare previous version link easily clickable24658-makes-compare-links-easily-clickableNur Rony2016-11-191-0/+1
* | | | | Merge branch '24070-project-margins' into 'master' Annabel Dunstone Gray2016-11-181-2/+28
|\ \ \ \ \
| * | | | | Fix after reviewFilipa Lacerda2016-11-181-2/+4
| * | | | | Fixes margins for project buttons24070-project-marginsFilipa Lacerda2016-11-181-3/+27
* | | | | | Merge branch '24641-focus-state' into 'master' fix/use-authorized-projects-project-teamAnnabel Dunstone Gray2016-11-181-2/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix focus state in preview tabFilipa Lacerda2016-11-181-2/+7
| |/ / / /
* | | | | Merge branch 'feature/precalculate-authorized-projects' into 'master' Douwe Maan2016-11-1810-47/+128
|\ \ \ \ \
| * | | | | Precalculate user's authorized projects in databaseAhmad Sherif2016-11-1810-47/+128
* | | | | | Merge branch 'less-intrusive-system-note' into 'master' Fatih Acet2016-11-185-25/+146
|\ \ \ \ \ \
| * | | | | | makes system notes less intrusive to a conversationless-intrusive-system-noteNur Rony2016-11-175-25/+146
* | | | | | | Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński2016-11-188-22/+115
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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-17165-321/+605
| |\ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | Rename from service, and move to lib/gitlabZ.J. van de Weg2016-11-179-177/+0
| * | | | | | | Refactor and test Slash commandsZ.J. van de Weg2016-11-179-37/+42
| * | | | | | | First steps on refactoring Mattermost Slash commandsZ.J. van de Weg2016-11-1711-205/+120
| * | | | | | | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-177-32/+63
| * | | | | | | Remove duplication of implementationsZ.J. van de Weg2016-11-173-12/+3
| * | | | | | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-172-0/+65
| * | | | | | | Add issue create subcommandZ.J. van de Weg2016-11-172-7/+14
| * | | | | | | fixup! issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-174-5/+5
| * | | | | | | issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-177-1/+246
| * | | | | | | Fix `chat_names` before_actionKamil Trzcinski2016-11-171-1/+1
| * | | | | | | Add most of specs for chat namesKamil Trzcinski2016-11-173-9/+32
| * | | | | | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-178-0/+192
* | | | | | | | Improved Ruby code in autocomplete user searchPhil Hughes2016-11-181-1/+1
* | | | | | | | Merge branch '24617-skipped-icon-title' into 'master' Fatih Acet2016-11-181-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove title from skipped status svg24617-skipped-icon-titleAnnabel Dunstone Gray2016-11-181-1/+1
* | | | | | | | Merge branch '23205-information-about-environments-build-page' into 'master' Fatih Acet2016-11-185-3/+97
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix builds/show spec; use iid instead of id23205-information-about-environments-build-pageAnnabel Dunstone Gray2016-11-172-2/+2
| * | | | | | | | Fix tests and add has_environment?Kamil Trzcinski2016-11-173-5/+9
| * | | | | | | | Improve specs and add missing cases that were not supportedKamil Trzcinski2016-11-174-21/+48
| * | | | | | | | Finish specs for environment infoAnnabel Dunstone Gray2016-11-091-9/+4
| * | | | | | | | First pass at testsAnnabel Dunstone Gray2016-11-091-7/+8
| * | | | | | | | Expose `last_deployment` on `Ci::Builds` [ci skip]Kamil Trzcinski2016-11-084-22/+47
| * | | | | | | | Add switch statement & last_deployment methodAnnabel Dunstone Gray2016-11-083-3/+31
| * | | | | | | | Start adding environment infoAnnabel Dunstone Gray2016-11-082-0/+14
* | | | | | | | | Merge branch 'pass-correct-tag-target-to-post-receive' into 'master' Sean McGivern2016-11-181-3/+10
|\ \ \ \ \ \ \ \ \