Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' | Grzegorz Bizon | 2016-12-20 | 2 | -15/+19 |
|\ | |||||
| * | Use a block to insert extra check for authenticate_build!fix-forbidden-for-build-api-for-deleted-project | Lin Jen-Shin | 2016-12-20 | 1 | -3/+6 |
| * | Prefer unless over if not | Lin Jen-Shin | 2016-12-19 | 1 | -1/+1 |
| * | Use a separate method to skip validation | Lin Jen-Shin | 2016-12-19 | 2 | -3/+8 |
| * | Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-a... | Lin Jen-Shin | 2016-12-19 | 55 | -303/+1361 |
| |\ | |||||
| * | | Give forbidden if project for the build was deleted | Lin Jen-Shin | 2016-12-15 | 2 | -15/+11 |
* | | | Merge branch 'bb-wiki-import' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 3 | -1/+25 |
|\ \ \ | |||||
| * | | | Add Wiki import to BB importer | Valery Sizov | 2016-12-19 | 3 | -1/+25 |
* | | | | Merge branch 'ldap_maint_task' into 'master' | Nick Thomas | 2016-12-19 | 1 | -0/+40 |
|\ \ \ \ | |||||
| * | | | | Add LDAP task to rename a provider | Drew Blessing | 2016-12-16 | 1 | -0/+40 |
* | | | | | Merge branch 'fix-yaml-variables' into 'master' | Grzegorz Bizon | 2016-12-19 | 2 | -1/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Keep the value type for YAML variables | Lin Jen-Shin | 2016-12-19 | 2 | -2/+1 |
| * | | | | | Just implement it in the block | Lin Jen-Shin | 2016-12-19 | 1 | -9/+5 |
| * | | | | | Merge branch 'master' into fix-yaml-variables | Lin Jen-Shin | 2016-12-19 | 48 | -293/+1290 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Rename to Gitlab::Serialize::Ci::Variables | Lin Jen-Shin | 2016-12-16 | 2 | -31/+32 |
| * | | | | | Just use YAML.safe_load and assume the format | Lin Jen-Shin | 2016-12-15 | 1 | -23/+3 |
| * | | | | | Strictly check the type loaded from YAML | Lin Jen-Shin | 2016-12-15 | 1 | -3/+24 |
| * | | | | | Convert CI YAML variables keys into strings | Lin Jen-Shin | 2016-12-15 | 2 | -1/+31 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'fix/import-export-mr-error' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix MR issue to do with merge user | James Lopez | 2016-12-19 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fix for missing service when importing from EE to CEfix/import-export-ee-services | James Lopez | 2016-12-19 | 2 | -1/+8 |
* | | | | | Merge branch 'fix/import-export-build-token' into 'master' | Grzegorz Bizon | 2016-12-19 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix duplicated build token problem and added relevant specfix/import-export-build-token | James Lopez | 2016-12-19 | 1 | -0/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'fix/detailed-status-groups' into 'master' | Lin Jen-Shin (godfat) | 2016-12-19 | 4 | -10/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Improve how we calculate detailed status group name | Grzegorz Bizon | 2016-12-16 | 1 | -1/+1 |
| * | | | | Update status group name for success with warnings | Grzegorz Bizon | 2016-12-16 | 1 | -1/+1 |
| * | | | | Make CI/CD detailed status group concept explicit | Grzegorz Bizon | 2016-12-16 | 3 | -8/+9 |
* | | | | | Merge branch '25301-git-2.11-force-push-bug' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 7 | -10/+71 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Implement final review comments from @rymai.25301-git-2.11-force-push-bug | Timothy Andrew | 2016-12-16 | 2 | -7/+9 |
| * | | | | Implement review comments from @dbalexandre. | Timothy Andrew | 2016-12-16 | 1 | -10/+12 |
| * | | | | Check the exit code while invoking git in the force push check. | Timothy Andrew | 2016-12-16 | 1 | -2/+7 |
| * | | | | Validate environment variables in `Gitlab::Git::RevList` | Timothy Andrew | 2016-12-16 | 1 | -3/+13 |
| * | | | | 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 | 2 | -4/+38 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templates | Kamil Trzcinski | 2016-12-18 | 220 | -2810/+6547 |
| |\ \ \ \ | |||||
| * | | | | | Update templates.rb | Kamil Trzciński | 2016-12-16 | 1 | -1/+1 |
| * | | | | | Refactored JS | Luke "Jared" Bennett | 2016-11-08 | 1 | -1/+4 |
| * | | | | | Allow to use Dockerfile templates | Kamil Trzcinski | 2016-11-08 | 2 | -5/+36 |
* | | | | | | 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 '25741_enable_multiline_operation_indentation_rubocop_rule' into... | Sean McGivern | 2016-12-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741 | Rydkin Maxim | 2016-12-16 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Fix rubocop failureszj-mattermost-session | Kamil Trzcinski | 2016-12-17 | 1 | -15/+21 |
* | | | | | | Store mattermost_url in settings | Kamil Trzcinski | 2016-12-17 | 1 | -8/+9 |
* | | | | | | Improve Mattermost Session specs | Kamil Trzcinski | 2016-12-17 | 1 | -11/+12 |
* | | | | | | 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 | 1 | -3/+6 |
* | | | | | | Setup mattermost session | Z.J. van de Weg | 2016-12-17 | 1 | -0/+102 |
* | | | | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1 | Douglas Barbosa Alexandre | 2016-12-16 | 4 | -10/+10 |
* | | | | | | Fix import issues method | Douglas Barbosa Alexandre | 2016-12-16 | 1 | -4/+4 |