Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix 500 when accessing private project when not logged infix-ci-non-public-project | Kamil Trzcinski | 2015-09-17 | 2 | -6/+1 |
* | Merge branch 'remove-ci-help' into 'master' | Kamil Trzciński | 2015-09-17 | 4 | -80/+0 |
|\ | |||||
| * | Remove CI help | Kamil Trzcinski | 2015-09-17 | 4 | -80/+0 |
* | | Merge branch 'refactor-blob-upload-locals' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 4 | -18/+11 |
|\ \ | |/ |/| | |||||
| * | Move partial locals out of controller | Stan Hu | 2015-09-17 | 4 | -18/+11 |
|/ | |||||
* | Merge pull request #9618 from pjknkda/repo-info-to-issue-hook | Stan Hu | 2015-09-17 | 4 | -0/+29 |
|\ | |||||
| * | add repository field to issue hook data | Jungkook Park | 2015-09-17 | 4 | -0/+29 |
* | | Merge branch 'ci-nav-changes' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 8 | -143/+25 |
|\ \ | |||||
| * | | Fix nav_link for dashboard | Kamil Trzcinski | 2015-09-17 | 1 | -2/+2 |
| * | | Remove duplicate code | Kamil Trzcinski | 2015-09-17 | 1 | -108/+0 |
| * | | Check current_controller against controller_path | Kamil Trzcinski | 2015-09-17 | 1 | -1/+3 |
| * | | Integrate CI navigation more tightly with project | Kamil Trzcinski | 2015-09-17 | 6 | -34/+22 |
|/ / | |||||
* | | Merge branch 'fix-schema-downgrade' into 'master' | Kamil Trzciński | 2015-09-17 | 1 | -1/+2 |
|\ \ | |||||
| * | | Fix schema downgrade introduced by: https://gitlab.com/gitlab-org/gitlab-ce/m...fix-schema-downgrade | Kamil Trzcinski | 2015-09-17 | 1 | -1/+2 |
* | | | Merge branch 'ci-whenever-clear' into 'master' | Kamil Trzciński | 2015-09-17 | 1 | -11/+18 |
|\ \ \ | |/ / |/| | | |||||
| * | | Remove CI cronjob during migrationci-whenever-clear | Jacob Vosmaer | 2015-09-17 | 1 | -11/+18 |
|/ / | |||||
* | | Merge branch 'fix-issue-2382' into 'master' | Stan Hu | 2015-09-17 | 12 | -14/+83 |
|\ \ | |||||
| * | | Create a "destroyed Milestone" event and keep Milestone events around in the DB | Stan Hu | 2015-09-15 | 12 | -14/+83 |
* | | | Merge branch 'enable_ssl_by_default' into 'master' | Valery Sizov | 2015-09-17 | 4 | -4/+16 |
|\ \ \ | |||||
| * | | | enable SSL by defaultenable_ssl_by_default | Valery Sizov | 2015-09-17 | 4 | -4/+16 |
* | | | | Merge branch 'fix-ci-500-on-settings' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix 500 on CI project settingsfix-ci-500-on-settings | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 |
* | | | | | Merge branch 'fix-public-projects' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 1 | -5/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Fix displaying public projectsfix-public-projects | Kamil Trzcinski | 2015-09-16 | 1 | -5/+0 |
* | | | | | | Merge branch 'restrict-user-api-integers' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 3 | -1/+58 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Restrict users API endpoints to use integer IDs | Stan Hu | 2015-08-23 | 3 | -1/+58 |
* | | | | | | | Merge branch 'fix-gh-issue-9640' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Fix HTML link that was improperly escaped in new user e-mail | Stan Hu | 2015-09-16 | 2 | -1/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'update-mailroom' into 'master' | Robert Speicher | 2015-09-16 | 2 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix Gemfile.lock | Douwe Maan | 2015-09-16 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' into update-mailroom | Douwe Maan | 2015-09-16 | 351 | -460/+16498 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update mail_room | Douwe Maan | 2015-09-16 | 2 | -3/+6 |
* | | | | | | | Merge branch 'fix-nginx' into 'master' | Kamil Trzciński | 2015-09-16 | 2 | -0/+24 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Add missing proxy requests to migration docsfix-nginx | Kamil Trzcinski | 2015-09-16 | 2 | -0/+24 |
* | | | | | | | Merge branch 'rs-install-guide' into 'master' | Robert Speicher | 2015-09-16 | 2 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sudo user is git, not gitlab, not gitlab_ci | Robert Speicher | 2015-09-16 | 1 | -2/+2 |
| * | | | | | | | Change 7-14-stable to 8-0-stable in doc/install/installation.md | Robert Speicher | 2015-09-16 | 1 | -4/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'rs-fix-update-guide' into 'master' | Robert Speicher | 2015-09-16 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sudo user is gitlab, not gitlab_ci | Robert Speicher | 2015-09-16 | 1 | -2/+2 |
| * | | | | | | | Add missing code fence closure | Robert Speicher | 2015-09-16 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fix-ci-nav' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 5 | -10/+4 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Fix confusing behaviour of back link in CI sidebar | Dmitriy Zaporozhets | 2015-09-16 | 5 | -10/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'style-ci-page' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 4 | -21/+56 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Style CI projects page and builds list | Dmitriy Zaporozhets | 2015-09-16 | 4 | -21/+56 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'fix-issue-2555' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 3 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Eliminate combined image_tag and image_path in providers list | Stan Hu | 2015-09-16 | 1 | -1/+1 |
| * | | | | | | Fix default avatars to ensure that helpers don't have /assets dir appended | Stan Hu | 2015-09-16 | 2 | -2/+2 |
* | | | | | | | Merge branch 'ldap-attributes' into 'master' | Robert Speicher | 2015-09-16 | 12 | -17/+167 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Make code clearerldap-attributes | Douwe Maan | 2015-09-16 | 1 | -11/+9 |
| * | | | | | | Add to changelog | Douwe Maan | 2015-09-09 | 1 | -0/+1 |