summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix CI status in the MR pageValery Sizov2015-09-185-75/+13
* Merge branch 'add-custom-text-to-help' into 'master' Jeroen van Baarsen2015-09-187-0/+17
|\
| * Allow custom info to be added to Help pageJeroen van Baarsen2015-09-187-0/+17
* | Merge branch 'fix-ci-non-public-project' into 'master' Dmitriy Zaporozhets2015-09-182-6/+1
|\ \
| * | Fix 500 when accessing private project when not logged infix-ci-non-public-projectKamil Trzcinski2015-09-172-6/+1
| |/
* | Merge branch 'fix-trending-projects' into 'master' Dmitriy Zaporozhets2015-09-182-14/+5
|\ \
| * | Fix 500 on trending projects if isntance has 100k+ projectsDmitriy Zaporozhets2015-09-182-14/+5
| |/
* | Merge branch 'fix-ci-settings-cancel' into 'master' Dmitriy Zaporozhets2015-09-181-1/+0
|\ \
| * | Remove Cancel button in Project settingsfix-ci-settings-cancelKamil Trzcinski2015-09-171-1/+0
| |/
* | Merge branch 'project-header-titles' into 'master' Dmitriy Zaporozhets2015-09-1866-55/+107
|\ \
| * \ Merge branch 'master' into project-header-titlesDouwe Maan2015-09-1822-253/+87
| |\ \ | | |/
| * | "Back to x" links are lowercase.project-header-titlesDouwe Maan2015-09-171-1/+1
| * | Fix active state of CI Help nav link.Douwe Maan2015-09-171-1/+1
| * | Rename "CI" in sidebar to "GitLab CI".Douwe Maan2015-09-171-1/+1
| * | Move project header title definition to view in question.Douwe Maan2015-09-1764-53/+103
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-09-188-95/+93
|\ \ \
| * \ \ Merge branch 'ci_projects_order' into 'master' Valery Sizov2015-09-188-95/+93
| |\ \ \ | | |_|/ | |/| |
| | * | Fix: ci projects orderci_projects_orderValery Sizov2015-09-178-95/+93
* | | | Merge branch 'global-key' into 'master' Job van der Voort2015-09-171-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fixed textkaren Carias2015-09-171-2/+1
| * | | note about global keyskaren Carias2015-09-131-0/+3
* | | | Merge branch 'remove-ci-help' into 'master'Kamil Trzciński2015-09-174-80/+0
|\ \ \ \
| * | | | Remove CI helpKamil Trzcinski2015-09-174-80/+0
* | | | | Merge branch 'refactor-blob-upload-locals' into 'master'Dmitriy Zaporozhets2015-09-174-18/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move partial locals out of controllerStan Hu2015-09-174-18/+11
|/ / / /
* | | | Merge pull request #9618 from pjknkda/repo-info-to-issue-hookStan Hu2015-09-174-0/+29
|\ \ \ \
| * | | | add repository field to issue hook dataJungkook Park2015-09-174-0/+29
* | | | | Merge branch 'ci-nav-changes' into 'master'Dmitriy Zaporozhets2015-09-178-143/+25
|\ \ \ \ \
| * | | | | Fix nav_link for dashboardKamil Trzcinski2015-09-171-2/+2
| * | | | | Remove duplicate codeKamil Trzcinski2015-09-171-108/+0
| * | | | | Check current_controller against controller_pathKamil Trzcinski2015-09-171-1/+3
| * | | | | Integrate CI navigation more tightly with projectKamil Trzcinski2015-09-176-34/+22
|/ / / / /
* | | | | Merge branch 'fix-schema-downgrade' into 'master'Kamil Trzciński2015-09-171-1/+2
|\ \ \ \ \
| * | | | | Fix schema downgrade introduced by: https://gitlab.com/gitlab-org/gitlab-ce/m...fix-schema-downgradeKamil Trzcinski2015-09-171-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ci-whenever-clear' into 'master'Kamil Trzciński2015-09-171-11/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove CI cronjob during migrationci-whenever-clearJacob Vosmaer2015-09-171-11/+18
|/ / / /
* | | | Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-1712-14/+83
|\ \ \ \ | |_|_|/ |/| | |
| * | | Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-1512-14/+83
* | | | Merge branch 'enable_ssl_by_default' into 'master'Valery Sizov2015-09-174-4/+16
|\ \ \ \
| * | | | enable SSL by defaultenable_ssl_by_defaultValery Sizov2015-09-174-4/+16
* | | | | Merge branch 'fix-ci-500-on-settings' into 'master'Dmitriy Zaporozhets2015-09-171-1/+1
|\ \ \ \ \
| * | | | | Fix 500 on CI project settingsfix-ci-500-on-settingsKamil Trzcinski2015-09-161-1/+1
* | | | | | Merge branch 'fix-public-projects' into 'master'Dmitriy Zaporozhets2015-09-171-5/+0
|\ \ \ \ \ \
| * | | | | | Fix displaying public projectsfix-public-projectsKamil Trzcinski2015-09-161-5/+0
* | | | | | | Merge branch 'restrict-user-api-integers' into 'master'Dmitriy Zaporozhets2015-09-173-1/+58
|\ \ \ \ \ \ \
| * | | | | | | Restrict users API endpoints to use integer IDsStan Hu2015-08-233-1/+58
* | | | | | | | Merge branch 'fix-gh-issue-9640' into 'master'Dmitriy Zaporozhets2015-09-172-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix HTML link that was improperly escaped in new user e-mailStan Hu2015-09-162-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'update-mailroom' into 'master'Robert Speicher2015-09-162-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix Gemfile.lockDouwe Maan2015-09-161-1/+1