summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve sourcesKamil Trzcinski2016-12-1912-97/+96
* Last fixesZ.J. van de Weg2016-12-193-17/+13
* Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-1936-156/+406
|\
| * Merge branch '25301-git-2.11-force-push-bug' into 'master' Douglas Barbosa Alexandre2016-12-1910-10/+147
| |\
| | * Implement final review comments from @rymai.25301-git-2.11-force-push-bugTimothy Andrew2016-12-163-51/+30
| | * Implement review comments from @dbalexandre.Timothy Andrew2016-12-164-92/+57
| | * Add CHANGELOG entry.Timothy Andrew2016-12-161-0/+4
| | * Check the exit code while invoking git in the force push check.Timothy Andrew2016-12-162-2/+26
| | * Validate environment variables in `Gitlab::Git::RevList`Timothy Andrew2016-12-164-3/+126
| | * Accept environment variables from the `pre-receive` script.Timothy Andrew2016-12-167-9/+51
| * | Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-1912-6/+138
| |\ \
| | * \ Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-182868-35378/+79204
| | |\ \
| | * | | Add CHANGELOGKamil Trzcinski2016-12-181-0/+4
| | * | | Update templates.rbKamil Trzciński2016-12-161-1/+1
| | * | | Refactored JSLuke "Jared" Bennett2016-11-087-42/+84
| | * | | Allow to use Dockerfile templatesKamil Trzcinski2016-11-089-7/+93
| * | | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-194-77/+36
| |\ \ \ \
| | * | | | Move admin application spinach test to rspecSemyon Pupkov2016-12-174-77/+36
| * | | | | Merge branch 'deploy-keys-to-rspec' into 'master' Rémy Coutable2016-12-193-62/+29
| |\ \ \ \ \
| | * | | | | Move admin deploy keys spinach test to rspecSemyon Pupkov2016-12-173-62/+29
| | |/ / / /
| * | | | | Merge branch 'fix-groups-helper-spec' into 'master' Stan Hu2016-12-191-1/+1
| |\ \ \ \ \
| | * | | | | Always use `fixture_file_upload` helper to upload files in tests.fix-groups-helper-specRuben Davila2016-12-181-1/+1
| |/ / / / /
| * | | | | Merge branch 'update-nginx-config-for-websockets' into 'master' Kamil Trzciński2016-12-182-0/+15
| |\ \ \ \ \
| | * | | | | Upgrade NGINX configuration files to add websocket supportNick Thomas2016-12-122-0/+15
| * | | | | | Merge branch 'correct-slack-slash-commands-pretty-path' into 'master' Kamil Trzciński2016-12-181-3/+2
| |\ \ \ \ \ \
| | * | | | | | Correct slack slash commands pretty pathcorrect-slack-slash-commands-pretty-pathLuke "Jared" Bennett2016-12-151-3/+2
| * | | | | | | Merge branch 'feature/runner-script-attempts-docs' into 'master' Kamil Trzciński2016-12-183-0/+29
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Add detailed docs in yaml README [ci skip]feature/runner-script-attempts-docsJames Lopez2016-12-161-0/+25
| | * | | | | | add new runner script attempts docs and update .gitlab-ci.ymlJames Lopez2016-12-152-0/+4
* | | | | | | | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt...Z.J. van de Weg2016-12-1916-150/+289
|\ \ \ \ \ \ \ \
| * | | | | | | | kamil frontend review changesLuke "Jared" Bennett2016-12-195-54/+60
| * | | | | | | | Added integration testsLuke "Jared" Bennett2016-12-191-14/+53
| * | | | | | | | zj frontend reviewLuke "Jared" Bennett2016-12-192-4/+3
| * | | | | | | | Remove mock emoji commentsLuke "Jared" Bennett2016-12-191-5/+0
| * | | | | | | | Removed UI to show the registered team as its not yet possibleLuke "Jared" Bennett2016-12-191-4/+0
| * | | | | | | | UX review changesLuke "Jared" Bennett2016-12-193-16/+25
| * | | | | | | | Correct views for first iteration agreementLuke "Jared" Bennett2016-12-196-59/+146
| * | | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-198-38/+31
* | | | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-1911-76/+91
|/ / / / / / / /
* | | | | | | | Merge branch 'mattermost-configure-frontend' into 'zj-mattermost-slash-config' Zeger-Jan van de Weg2016-12-198-148/+168
|\ \ \ \ \ \ \ \
| * | | | | | | | Started on new slash commands edit viewmattermost-configure-frontendLuke "Jared" Bennett2016-12-178-149/+169
* | | | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-18470-2142/+15996
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-1721-44/+45
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-1621-44/+45
| * | | | | | | Merge branch 'zj-mattermost-session' into 'master' Grzegorz Bizon2016-12-174-0/+227
| |\ \ \ \ \ \ \
| | * | | | | | | Fix rubocop failureszj-mattermost-sessionKamil Trzcinski2016-12-172-17/+23
| | * | | | | | | Store mattermost_url in settingsKamil Trzcinski2016-12-174-13/+35
| | * | | | | | | Improve Mattermost Session specsKamil Trzcinski2016-12-172-26/+50
| | * | | | | | | Ensure the session is destroyedZ.J. van de Weg2016-12-171-3/+5
| | * | | | | | | Improve session testsZ.J. van de Weg2016-12-173-45/+74