summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove Cancel button in Project settingsfix-ci-settings-cancelKamil Trzcinski2015-09-171-1/+0
* 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
| * | | | | Merge branch 'master' into update-mailroomDouwe Maan2015-09-16351-460/+16498
| |\ \ \ \ \
| * | | | | | Update mail_roomDouwe Maan2015-09-162-3/+6
* | | | | | | Merge branch 'fix-nginx' into 'master'Kamil Trzciński2015-09-162-0/+24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add missing proxy requests to migration docsfix-nginxKamil Trzcinski2015-09-162-0/+24
* | | | | | | Merge branch 'rs-install-guide' into 'master'Robert Speicher2015-09-162-6/+6
|\ \ \ \ \ \ \
| * | | | | | | sudo user is git, not gitlab, not gitlab_ciRobert Speicher2015-09-161-2/+2
| * | | | | | | Change 7-14-stable to 8-0-stable in doc/install/installation.mdRobert Speicher2015-09-161-4/+4
|/ / / / / / /
* | | | | | | Merge branch 'rs-fix-update-guide' into 'master'Robert Speicher2015-09-161-2/+3
|\ \ \ \ \ \ \
| * | | | | | | sudo user is gitlab, not gitlab_ciRobert Speicher2015-09-161-2/+2
| * | | | | | | Add missing code fence closureRobert Speicher2015-09-161-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'fix-ci-nav' into 'master'Dmitriy Zaporozhets2015-09-165-10/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix confusing behaviour of back link in CI sidebarDmitriy Zaporozhets2015-09-165-10/+4
| |/ / / / /
* | | | | | Merge branch 'style-ci-page' into 'master'Dmitriy Zaporozhets2015-09-164-21/+56
|\ \ \ \ \ \
| * | | | | | Style CI projects page and builds listDmitriy Zaporozhets2015-09-164-21/+56
| |/ / / / /
* | | | | | Merge branch 'fix-issue-2555' into 'master'Dmitriy Zaporozhets2015-09-163-3/+3
|\ \ \ \ \ \
| * | | | | | Eliminate combined image_tag and image_path in providers listStan Hu2015-09-161-1/+1
| * | | | | | Fix default avatars to ensure that helpers don't have /assets dir appendedStan Hu2015-09-162-2/+2
* | | | | | | Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-1612-17/+167
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Make code clearerldap-attributesDouwe Maan2015-09-161-11/+9
| * | | | | | Add to changelogDouwe Maan2015-09-091-0/+1