summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-1827-51/+336
|\ \
| * | Precalculate user's authorized projects in databaseAhmad Sherif2016-11-1827-51/+336
* | | Merge branch 'less-intrusive-system-note' into 'master' Fatih Acet2016-11-188-28/+153
|\ \ \
| * | | makes system notes less intrusive to a conversationless-intrusive-system-noteNur Rony2016-11-178-28/+153
* | | | Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński2016-11-1826-29/+756
|\ \ \ \
| * | | | Rename mattermost_command to mattermost_slash_commandszj-slash-commands-mattermostKamil Trzcinski2016-11-187-15/+15
| * | | | Fix typosZ.J. van de Weg2016-11-184-23/+13
| * | | | Return a consistent not found messageZ.J. van de Weg2016-11-186-12/+26
| * | | | Improve style, add more testsZ.J. van de Weg2016-11-1810-29/+38
| * | | | Projects have chat servicesZ.J. van de Weg2016-11-182-0/+2
| * | | | More coverage on service levelZ.J. van de Weg2016-11-188-9/+177
| * | | | Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-17311-892/+3128
| |\ \ \ \
| * | | | | More refactoring, push present to base commandZ.J. van de Weg2016-11-1712-54/+85
| * | | | | Add tests for increased converageZ.J. van de Weg2016-11-178-37/+45
| * | | | | Remove some commands for nowZ.J. van de Weg2016-11-1712-200/+30
| * | | | | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-1715-91/+151
| * | | | | Rename from service, and move to lib/gitlabZ.J. van de Weg2016-11-1723-177/+233
| * | | | | Refactor and test Slash commandsZ.J. van de Weg2016-11-1718-241/+255
| * | | | | First steps on refactoring Mattermost Slash commandsZ.J. van de Weg2016-11-1714-260/+234
| * | | | | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-179-35/+92
| * | | | | Remove duplication of implementationsZ.J. van de Weg2016-11-175-28/+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-173-7/+27
| * | | | | 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-1712-1/+455
| * | | | | Fix `chat_names` before_actionKamil Trzcinski2016-11-171-1/+1
| * | | | | Add most of specs for chat namesKamil Trzcinski2016-11-1712-22/+182
| * | | | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-1712-1/+278
* | | | | | Merge branch 'fix-tests-for-different-host' into 'master' Rémy Coutable2016-11-1811-16/+17
|\ \ \ \ \ \
| * | | | | | Use `Gitlab.config.gitlab.host` over `'localhost'`fix-tests-for-different-hostLin Jen-Shin2016-11-1811-16/+17
* | | | | | | Merge branch 'autocomplete-find-user-improv' into 'master' Rémy Coutable2016-11-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Improved Ruby code in autocomplete user searchPhil Hughes2016-11-181-1/+1
* | | | | | | | Merge branch 'rs-empty-todo-messages' into 'master' Alfredo Sumaran2016-11-181-7/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve consistency of empty todo list messagesRobert Speicher2016-11-181-7/+5
* | | | | | | | | Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan2016-11-187-6/+199
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add a CHANGELOG entrybugfix/html-only-mailhttp://jneen.net/2016-11-181-0/+4
| * | | | | | | | | fix indentation for rubocophttp://jneen.net/2016-11-171-3/+3
| * | | | | | | | | rename `part` variable and guard against nil content_typehttp://jneen.net/2016-11-171-7/+5
| * | | | | | | | | completely remove blockquote and table tagshttp://jneen.net/2016-11-171-2/+2
| * | | | | | | | | use Nokogiri::HTML.parse instead of capitalized methodhttp://jneen.net/2016-11-171-1/+1
| * | | | | | | | | fix rubocop failureshttp://jneen.net/2016-11-172-2/+4
| * | | | | | | | | add parsing support for incoming html emailhttp://jneen.net/2016-11-176-5/+194
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-...Rémy Coutable2016-11-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rely on Gitlab::Shell public API, not reading internal files it may use24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-to-failRémy Coutable2016-11-181-1/+1
* | | | | | | | | | Merge branch 'docs/no-artifacts-passing' into 'master' Achilleas Pipinellis2016-11-181-0/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Document how to prevent artifacts from passing to next stageAchilleas Pipinellis2016-11-181-0/+9
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | 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
View Lorry Controller Status