summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix for missing service when importing from EE to CEfix/import-export-ee-servicesJames Lopez2016-12-194-1/+34
* Merge branch 'fix/import-export-build-token' into 'master' Grzegorz Bizon2016-12-194-1/+17
|\
| * updated specJames Lopez2016-12-191-2/+2
| * Fix duplicated build token problem and added relevant specfix/import-export-build-tokenJames Lopez2016-12-194-1/+17
* | Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-1921-23/+102
|\ \
| * | Fix extra spacing in all rgba methods in status filefix/detailed-status-groupsFilipa Lacerda2016-12-171-8/+8
| * | Improve spacing and fixes manual status colorFilipa Lacerda2016-12-172-7/+7
| * | Add `ci-manual` status CSS with darkest gray colorGrzegorz Bizon2016-12-171-0/+13
| * | Fix CI/CD statuses actions' CSS on pipeline graphsGrzegorz Bizon2016-12-172-2/+2
| * | Improve how we calculate detailed status group nameGrzegorz Bizon2016-12-161-1/+1
| * | Update status group name for success with warningsGrzegorz Bizon2016-12-162-1/+5
| * | Adds CSSFilipa Lacerda2016-12-161-0/+8
| * | Make CI/CD detailed status group concept explicitGrzegorz Bizon2016-12-1615-10/+64
* | | Merge branch 'jej-fix-doc-performance-link-to-monitoring' into 'master' Nick Thomas2016-12-191-1/+1
|\ \ \
| * | | Fix link from doc/development/performance.md to 'Performance Monitoring'jej-fix-doc-performance-link-to-monitoringJames Edwards-Jones2016-12-171-1/+1
* | | | Merge branch 'improve-pipeline-fixtures' into 'master' Kamil Trzciński2016-12-191-19/+44
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into improve-pipeline-fixturesimprove-pipeline-fixturesKamil Trzcinski2016-12-182310-14382/+41110
| |\ \ \ \
| * | | | | Improve pipeline fixturesKamil Trzcinski2016-11-281-19/+44
* | | | | | Merge branch 'fix/ci-readme-typo' into 'master' Grzegorz Bizon2016-12-191-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typofix/ci-readme-typoJames Lopez2016-12-191-1/+1
* | | | | | | 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 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
View Lorry Controller Status