Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve sources | Kamil Trzcinski | 2016-12-19 | 12 | -97/+96 |
* | Last fixes | Z.J. van de Weg | 2016-12-19 | 3 | -17/+13 |
* | Merge branch 'master' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-19 | 36 | -156/+406 |
|\ | |||||
| * | Merge branch '25301-git-2.11-force-push-bug' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 10 | -10/+147 |
| |\ | |||||
| | * | Implement final review comments from @rymai.25301-git-2.11-force-push-bug | Timothy Andrew | 2016-12-16 | 3 | -51/+30 |
| | * | Implement review comments from @dbalexandre. | Timothy Andrew | 2016-12-16 | 4 | -92/+57 |
| | * | Add CHANGELOG entry. | Timothy Andrew | 2016-12-16 | 1 | -0/+4 |
| | * | Check the exit code while invoking git in the force push check. | Timothy Andrew | 2016-12-16 | 2 | -2/+26 |
| | * | Validate environment variables in `Gitlab::Git::RevList` | Timothy Andrew | 2016-12-16 | 4 | -3/+126 |
| | * | Accept environment variables from the `pre-receive` script. | Timothy Andrew | 2016-12-16 | 7 | -9/+51 |
| * | | Merge branch 'dockerfile-templates' into 'master' | Rémy Coutable | 2016-12-19 | 12 | -6/+138 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templates | Kamil Trzcinski | 2016-12-18 | 2868 | -35378/+79204 |
| | |\ \ | |||||
| | * | | | Add CHANGELOG | Kamil Trzcinski | 2016-12-18 | 1 | -0/+4 |
| | * | | | Update templates.rb | Kamil Trzciński | 2016-12-16 | 1 | -1/+1 |
| | * | | | Refactored JS | Luke "Jared" Bennett | 2016-11-08 | 7 | -42/+84 |
| | * | | | Allow to use Dockerfile templates | Kamil Trzcinski | 2016-11-08 | 9 | -7/+93 |
| * | | | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 4 | -77/+36 |
| |\ \ \ \ | |||||
| | * | | | | Move admin application spinach test to rspec | Semyon Pupkov | 2016-12-17 | 4 | -77/+36 |
| * | | | | | Merge branch 'deploy-keys-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 3 | -62/+29 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move admin deploy keys spinach test to rspec | Semyon Pupkov | 2016-12-17 | 3 | -62/+29 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'fix-groups-helper-spec' into 'master' | Stan Hu | 2016-12-19 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Always use `fixture_file_upload` helper to upload files in tests.fix-groups-helper-spec | Ruben Davila | 2016-12-18 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'update-nginx-config-for-websockets' into 'master' | Kamil Trzciński | 2016-12-18 | 2 | -0/+15 |
| |\ \ \ \ \ | |||||
| | * | | | | | Upgrade NGINX configuration files to add websocket support | Nick Thomas | 2016-12-12 | 2 | -0/+15 |
| * | | | | | | Merge branch 'correct-slack-slash-commands-pretty-path' into 'master' | Kamil Trzciński | 2016-12-18 | 1 | -3/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Correct slack slash commands pretty pathcorrect-slack-slash-commands-pretty-path | Luke "Jared" Bennett | 2016-12-15 | 1 | -3/+2 |
| * | | | | | | | Merge branch 'feature/runner-script-attempts-docs' into 'master' | Kamil Trzciński | 2016-12-18 | 3 | -0/+29 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Add detailed docs in yaml README [ci skip]feature/runner-script-attempts-docs | James Lopez | 2016-12-16 | 1 | -0/+25 |
| | * | | | | | | add new runner script attempts docs and update .gitlab-ci.yml | James Lopez | 2016-12-15 | 2 | -0/+4 |
* | | | | | | | | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt... | Z.J. van de Weg | 2016-12-19 | 16 | -150/+289 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | kamil frontend review changes | Luke "Jared" Bennett | 2016-12-19 | 5 | -54/+60 |
| * | | | | | | | | Added integration tests | Luke "Jared" Bennett | 2016-12-19 | 1 | -14/+53 |
| * | | | | | | | | zj frontend review | Luke "Jared" Bennett | 2016-12-19 | 2 | -4/+3 |
| * | | | | | | | | Remove mock emoji comments | Luke "Jared" Bennett | 2016-12-19 | 1 | -5/+0 |
| * | | | | | | | | Removed UI to show the registered team as its not yet possible | Luke "Jared" Bennett | 2016-12-19 | 1 | -4/+0 |
| * | | | | | | | | UX review changes | Luke "Jared" Bennett | 2016-12-19 | 3 | -16/+25 |
| * | | | | | | | | Correct views for first iteration agreement | Luke "Jared" Bennett | 2016-12-19 | 6 | -59/+146 |
| * | | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 8 | -38/+31 |
* | | | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 11 | -76/+91 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'mattermost-configure-frontend' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-19 | 8 | -148/+168 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Started on new slash commands edit viewmattermost-configure-frontend | Luke "Jared" Bennett | 2016-12-17 | 8 | -149/+169 |
* | | | | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 470 | -2142/+15996 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into... | Sean McGivern | 2016-12-17 | 21 | -44/+45 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741 | Rydkin Maxim | 2016-12-16 | 21 | -44/+45 |
| * | | | | | | | Merge branch 'zj-mattermost-session' into 'master' | Grzegorz Bizon | 2016-12-17 | 4 | -0/+227 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix rubocop failureszj-mattermost-session | Kamil Trzcinski | 2016-12-17 | 2 | -17/+23 |
| | * | | | | | | | Store mattermost_url in settings | Kamil Trzcinski | 2016-12-17 | 4 | -13/+35 |
| | * | | | | | | | Improve Mattermost Session specs | Kamil Trzcinski | 2016-12-17 | 2 | -26/+50 |
| | * | | | | | | | Ensure the session is destroyed | Z.J. van de Weg | 2016-12-17 | 1 | -3/+5 |
| | * | | | | | | | Improve session tests | Z.J. van de Weg | 2016-12-17 | 3 | -45/+74 |