Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix CI status in the MR page | Valery Sizov | 2015-09-18 | 5 | -75/+13 |
* | Merge branch 'add-custom-text-to-help' into 'master' | Jeroen van Baarsen | 2015-09-18 | 7 | -0/+17 |
|\ | |||||
| * | Allow custom info to be added to Help page | Jeroen van Baarsen | 2015-09-18 | 7 | -0/+17 |
* | | Merge branch 'fix-ci-non-public-project' into 'master' | Dmitriy Zaporozhets | 2015-09-18 | 2 | -6/+1 |
|\ \ | |||||
| * | | Fix 500 when accessing private project when not logged infix-ci-non-public-project | Kamil Trzcinski | 2015-09-17 | 2 | -6/+1 |
| |/ | |||||
* | | Merge branch 'fix-trending-projects' into 'master' | Dmitriy Zaporozhets | 2015-09-18 | 2 | -14/+5 |
|\ \ | |||||
| * | | Fix 500 on trending projects if isntance has 100k+ projects | Dmitriy Zaporozhets | 2015-09-18 | 2 | -14/+5 |
| |/ | |||||
* | | Merge branch 'fix-ci-settings-cancel' into 'master' | Dmitriy Zaporozhets | 2015-09-18 | 1 | -1/+0 |
|\ \ | |||||
| * | | Remove Cancel button in Project settingsfix-ci-settings-cancel | Kamil Trzcinski | 2015-09-17 | 1 | -1/+0 |
| |/ | |||||
* | | Merge branch 'project-header-titles' into 'master' | Dmitriy Zaporozhets | 2015-09-18 | 66 | -55/+107 |
|\ \ | |||||
| * \ | Merge branch 'master' into project-header-titles | Douwe Maan | 2015-09-18 | 22 | -253/+87 |
| |\ \ | | |/ | |||||
| * | | "Back to x" links are lowercase.project-header-titles | Douwe Maan | 2015-09-17 | 1 | -1/+1 |
| * | | Fix active state of CI Help nav link. | Douwe Maan | 2015-09-17 | 1 | -1/+1 |
| * | | Rename "CI" in sidebar to "GitLab CI". | Douwe Maan | 2015-09-17 | 1 | -1/+1 |
| * | | Move project header title definition to view in question. | Douwe Maan | 2015-09-17 | 64 | -53/+103 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-09-18 | 8 | -95/+93 |
|\ \ \ | |||||
| * \ \ | Merge branch 'ci_projects_order' into 'master' | Valery Sizov | 2015-09-18 | 8 | -95/+93 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix: ci projects orderci_projects_order | Valery Sizov | 2015-09-17 | 8 | -95/+93 |
* | | | | Merge branch 'global-key' into 'master' | Job van der Voort | 2015-09-17 | 1 | -0/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fixed text | karen Carias | 2015-09-17 | 1 | -2/+1 |
| * | | | note about global keys | karen Carias | 2015-09-13 | 1 | -0/+3 |
* | | | | 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 |