summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use gitlab-workhorse 0.5.3gitlab-workhorse-0.5.3Jacob Vosmaer2016-01-113-3/+3
* Merge branch 'load-autocomplete-when-needed' into 'master' Dmitriy Zaporozhets2016-01-112-12/+15
|\
| * Only load autocomplete data when actually neededYorick Peterse2016-01-112-12/+15
* | Merge branch 'fix-build-page-typo' into 'master' Kamil Trzciński2016-01-111-1/+1
|\ \
| * | Fix typo in build page of projectsSteffen Köhler2016-01-101-1/+1
* | | Merge branch 'doc-update' into 'master' Achilleas Pipinellis2016-01-111-2/+3
|\ \ \ | |_|/ |/| |
| * | Update docs for shared runner default settingsLuke Waite2016-01-101-2/+3
* | | Merge branch 'autocomplete-on-load' into 'master' Dmitriy Zaporozhets2016-01-111-13/+12
|\ \ \
| * | | Load autocomplete data when loading an issue pageautocomplete-on-loadYorick Peterse2016-01-081-13/+12
* | | | Merge branch 'new-branch-position-fix' into 'master' Dmitriy Zaporozhets2016-01-112-2/+7
|\ \ \ \
| * | | | fixes new branch button positioning, when visible and not visible containernew-branch-position-fixJacob Schatz2016-01-082-2/+7
* | | | | Merge branch 'add-pencil-icon-to-group-page' into 'master' Dmitriy Zaporozhets2016-01-111-3/+6
|\ \ \ \ \
| * | | | | Check for current userStan Hu2016-01-101-1/+2
| * | | | | Add pencil icon to edit group settingsStan Hu2016-01-101-3/+5
* | | | | | Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/git...Dmitriy Zaporozhets2016-01-113-2/+1
|\ \ \ \ \ \
| * | | | | | Fix duplicated branch creation/deletion events when using Web UIStan Hu2016-01-083-2/+1
* | | | | | | Merge branch 'master' into 'master' Jeroen Nijhof2016-01-117-2/+58
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-1141-78/+258
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'Issue#5817' into 'master' Stan Hu2016-01-112-4/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Issue #5817 wording of the web hooks updated on issue and merge eventsiqualisoni2016-01-112-4/+4
* | | | | | | | Merge branch 'check-for-present-runner-token' into 'master' Stan Hu2016-01-114-5/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Before project save ensure that a runners_token existsStan Hu2016-01-102-1/+2
| * | | | | | | | Fix Error 500 when visiting build page of project with nil runners_tokenStan Hu2016-01-104-5/+30
|/ / / / / / / /
* | | | | | | | Remove outdated gitlab-git-http-server reference from Install docRobert Speicher2016-01-101-2/+2
* | | | | | | | Merge branch 'fix_jira_shortterm' into 'master' Robert Speicher2016-01-102-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not call API if there is no API URLDrew Blessing2016-01-072-0/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'update-changelog-with-email-reply-fix' into 'master' Robert Speicher2016-01-101-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add CHANGELOG entry for reply-by-email fixStan Hu2016-01-091-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'disable-blocked-in-abuse-reports' into 'master' Robert Speicher2016-01-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Disable "Already Blocked" button in admin abuse report pageStan Hu2016-01-091-1/+1
|/ / / / / /
* | | | | | Merge branch 'doc_clean_up_add_users' into 'master' Achilleas Pipinellis2016-01-0914-13/+77
|\ \ \ \ \ \
| * | | | | | Clean up document on adding users to a projectAchilleas Pipinellis2016-01-0914-13/+77
|/ / / / / /
* | | | | | Merge branch 'cross-project-reference-typo-fix' into 'master' Robert Speicher2016-01-081-1/+1
|\ \ \ \ \ \
| * | | | | | changes verb `references` to noun `reference`.cross-project-reference-typo-fixJacob Schatz2016-01-081-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Remove Block Button from Abuse Reports page if User is Already Blocked Robert Speicher2016-01-081-1/+4
|\ \ \ \ \ \
| * | | | | | Show that user is already blocked on Abuse Reportsfix-block-button-still-showing-on-abuse-reports-after-user-is-blockedKelvin2016-01-061-0/+3
| * | | | | | Remove block button on abuse reports if user is already blockedKelvin2016-01-061-1/+1
* | | | | | | Add a CHANGELOG entry for The Most Important Feature of All Time(TM)Robert Speicher2016-01-081-0/+2
* | | | | | | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-0811-51/+94
|\ \ \ \ \ \ \
| * | | | | | | DRY up upload and download servicesapi-project-uploadDouwe Maan2016-01-085-37/+30
| * | | | | | | Update specDouwe Maan2016-01-072-9/+12
| * | | | | | | Satisfy RubocpDouwe Maan2016-01-071-1/+1
| * | | | | | | Add API project upload endpointDouwe Maan2016-01-078-23/+70
* | | | | | | | Merge branch 'blacklist-new' into 'master' Robert Speicher2016-01-081-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Blacklist 'new'blacklist-newRobert Schilling2016-01-081-0/+1
* | | | | | | | | Merge branch 'suppress-allow-failure-builds' into 'master' Stan Hu2016-01-085-1/+31
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Suppress e-mails on failed builds if allow_failure is setStan Hu2016-01-075-1/+31
* | | | | | | | | Merge branch 'rs-single-item-task-list-spec' into 'master' Douwe Maan2016-01-081-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add spec for single-item task listsrs-single-item-task-list-specRobert Speicher2016-01-071-0/+6
| | |_|_|_|/ / / | |/| | | | | |
| | | | | | * | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0826-100/+251
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |