Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure Unicorn listens on localhost:8080unicorn-listen-8080 | Jacob Vosmaer | 2015-09-25 | 1 | -0/+13 |
* | Merge branch 'hook-api-updates' into 'master' | Stan Hu | 2015-09-24 | 5 | -4/+38 |
|\ | |||||
| * | hooks: improve tests for hook API | Ben Boeckel | 2015-09-24 | 2 | -1/+27 |
| * | api: add enable_ssl_verification to PUT/POST hooks | Ben Boeckel | 2015-09-24 | 2 | -2/+6 |
| * | doc: list note_events as a valid parameter for PUT/POST hooks | Ben Boeckel | 2015-09-24 | 1 | -0/+2 |
| * | api: expose note_events and enable_ssl_verification for hooks | Ben Boeckel | 2015-09-24 | 2 | -1/+3 |
* | | Merge branch 'get-ci-token-from-ci-projects' into 'master' | Robert Speicher | 2015-09-24 | 4 | -5/+12 |
|\ \ | |||||
| * | | Test grace auth against gitlab_ci_project with tokenget-ci-token-from-ci-projects | Kamil Trzcinski | 2015-09-24 | 1 | -1/+4 |
| * | | Update stub syntax | Robert Speicher | 2015-09-24 | 1 | -1/+1 |
| * | | Fix grack auth spec | Kamil Trzcinski | 2015-09-24 | 1 | -1/+1 |
| * | | Fix specs | Kamil Trzcinski | 2015-09-24 | 2 | -2/+2 |
| * | | Remove unneeded change | Kamil Trzcinski | 2015-09-24 | 1 | -1/+2 |
| * | | Get GitLabCiService token from CI project | Kamil Trzcinski | 2015-09-24 | 1 | -4/+7 |
* | | | Merge pull request #9664 from fantasywind/patch-1 | Robert Schilling | 2015-09-24 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Update 7.14-to-8.0.md | Chia Yu Pai | 2015-09-24 | 1 | -0/+1 |
* | | | | Merge branch 'update-mailroom' into 'master' | Robert Speicher | 2015-09-24 | 5 | -3/+11 |
|\ \ \ \ | |||||
| * | | | | Update changelogupdate-mailroom | Douwe Maan | 2015-09-24 | 1 | -0/+2 |
| * | | | | Add and document option to use StartTLS with mail_room. | Douwe Maan | 2015-09-24 | 2 | -0/+6 |
| * | | | | Update mail_room | Douwe Maan | 2015-09-24 | 2 | -3/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'newrelic-grape' into 'master' | Robert Speicher | 2015-09-24 | 2 | -3/+5 |
|\ \ \ \ | |||||
| * | | | | Add the newrelic-grape gemnewrelic-grape | Jacob Vosmaer | 2015-09-24 | 2 | -3/+5 |
* | | | | | Merge branch 'fix-default-avatar-in-network-graph' into 'master' | Robert Speicher | 2015-09-24 | 2 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix default avatar not showing up in network graph | Stan Hu | 2015-09-24 | 2 | -1/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'rs-troubleshooting' into 'master' | Robert Speicher | 2015-09-24 | 2 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Update Troubleshooting sections | Robert Speicher | 2015-09-24 | 2 | -7/+8 |
| * | | | | | Add Troubleshooting section to 7.14 to 8.0 Update guiders-troubleshooting | Robert Speicher | 2015-09-23 | 1 | -0/+9 |
| * | | | | | Add Troubleshooting section to Install guide | Robert Speicher | 2015-09-23 | 1 | -0/+10 |
* | | | | | | Merge branch 'reference-apache-templates-8.0' into 'master' | Robert Speicher | 2015-09-24 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Refer to Apache templates in 8.0 update guidereference-apache-templates-8.0 | Jacob Vosmaer | 2015-09-24 | 1 | -0/+2 |
|/ / / / / | |||||
* | | | | | Merge branch 'remove-ci-dashboard' into 'master' | Douwe Maan | 2015-09-24 | 10 | -96/+9 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Remove CI dashboard | Dmitriy Zaporozhets | 2015-09-24 | 10 | -96/+9 |
* | | | | | Merge branch 'ci-status-projects-page' into 'master' | Dmitriy Zaporozhets | 2015-09-24 | 9 | -10/+39 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Show CI status on Your projects page and Starred projects pageci-status-projects-page | Dmitriy Zaporozhets | 2015-09-24 | 9 | -10/+39 |
|/ / / / | |||||
* | | | | Merge branch 'fix-markdown-preview-font' into 'master' | Dmitriy Zaporozhets | 2015-09-24 | 2 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use standard Markdown font in Markdown preview instead of fixed-width font | Stan Hu | 2015-09-23 | 2 | -1/+1 |
* | | | | | Merge branch 'build-status-on-commit-page' into 'master' | Dmitriy Zaporozhets | 2015-09-24 | 7 | -34/+61 |
|\ \ \ \ \ | |||||
| * | | | | | Show CI status on commit pagebuild-status-on-commit-page | Dmitriy Zaporozhets | 2015-09-24 | 3 | -0/+15 |
| * | | | | | Show CI status on commit page | Dmitriy Zaporozhets | 2015-09-24 | 2 | -0/+9 |
| * | | | | | Refactor ci-status badge css | Dmitriy Zaporozhets | 2015-09-24 | 2 | -34/+37 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'remove-routes-helper' into 'master' | Dmitriy Zaporozhets | 2015-09-24 | 5 | -39/+16 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix GitlabCiService specsremove-routes-helper | Kamil Trzcinski | 2015-09-22 | 1 | -2/+2 |
| * | | | | Fix CI | Kamil Trzcinski | 2015-09-22 | 1 | -0/+2 |
| * | | | | Fix Slack notification URL and remove the usage of Ci::RoutesHelper | Kamil Trzcinski | 2015-09-22 | 4 | -37/+12 |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-09-24 | 21 | -91/+151 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'move-ci-charts' into 'master' | Dmitriy Zaporozhets | 2015-09-24 | 16 | -69/+78 |
| |\ \ \ \ \ | |||||
| | * | | | | | Check for CI enabled in correct place | Dmitriy Zaporozhets | 2015-09-24 | 2 | -1/+1 |
| | * | | | | | Add header for ci graphs and check that it is enabled | Dmitriy Zaporozhets | 2015-09-24 | 2 | -0/+8 |
| | * | | | | | Merge branch 'master' into move-ci-charts | Dmitriy Zaporozhets | 2015-09-24 | 20 | -91/+160 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Update CHANGELOGmove-ci-charts | Dmitriy Zaporozhets | 2015-09-23 | 1 | -0/+1 |
| | * | | | | | | Move CI charts to project graphs area | Dmitriy Zaporozhets | 2015-09-23 | 14 | -69/+69 |