summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix line diff side-by-side line highlightingdiff-line-highlighting-fixPhil Hughes2016-09-131-2/+2
* Merge branch 'fix-commit-status' into 'master' Rémy Coutable2016-09-133-36/+58
|\
| * Fix an error where we were unable to create a CommitStatus for running statefix-commit-statusKamil Trzcinski2016-09-123-36/+58
* | Merge branch '19694-remove-duplication-between-project-builds-and-admin-build...Rémy Coutable2016-09-137-173/+81
|\ \
| * | Remove unnecessary variablesKatarzyna Kobierska2016-09-132-8/+8
| * | Code refactoringKatarzyna Kobierska2016-09-133-11/+14
| * | Improve build_path name and admin variableKatarzyna Kobierska2016-09-135-14/+13
| * | Fix error in pathsKatarzyna Kobierska2016-09-131-6/+5
| * | Build path with callKatarzyna Kobierska2016-09-134-30/+6
| * | Create shared partial for project and admin buildsKatarzyna Kobierska2016-09-136-93/+46
| * | Moved build tabs partial to sharedKatarzyna Kobierska2016-09-133-2/+2
| * | Improve table code and add CHANGELOGKatarzyna Kobierska2016-09-132-4/+3
| * | Improve code in table partialKatarzyna Kobierska2016-09-131-3/+4
| * | Improve codeKatarzyna Kobierska2016-09-135-10/+11
| * | Liken admin and project builds views to each otherKatarzyna Kobierska2016-09-133-43/+31
| * | Move builds content list to partialKatarzyna Kobierska2016-09-133-40/+45
| * | Use local variables in partialKatarzyna Kobierska2016-09-133-10/+10
| * | Change the way paths are generatedKatarzyna Kobierska2016-09-135-15/+9
| * | Add partial to admin builds and project buildsKatarzyna Kobierska2016-09-135-44/+34
* | | Merge branch 's3-region' into 'master' Achilleas Pipinellis2016-09-131-1/+3
|\ \ \ | |/ / |/| |
| * | include region for source installation s3-regionChris Wilson2016-09-131-0/+1
| * | Include region in S3 configurationChris Wilson2016-08-191-1/+2
* | | Merge branch '22057-fix-api-ossues-sorting-flaky-specs' into 'master' Stan Hu2016-09-133-0/+8
|\ \ \
| * | | Ensure specs on sorting of issues in API are deterministic on MySQL22057-fix-api-ossues-sorting-flaky-specsPaco Guzman2016-09-123-0/+8
| | |/ | |/|
* | | Merge branch 'rails-5-backports' into 'master' Robert Speicher2016-09-122-7/+3
|\ \ \
| * | | No need for this variable.Connor Shea2016-09-121-6/+1
| * | | Remove x-json mime_type, rename to json_mime_types.rails-5-backportsConnor Shea2016-09-111-3/+2
| * | | Fix two problematic bits of code that will be deprecated or broken in Rails 5.Connor Shea2016-09-052-7/+9
* | | | Merge branch 'update-templates' into 'master' Robert Speicher2016-09-1213-5/+82
|\ \ \ \
| * | | | Update templates.update-templatesRuben Davila2016-09-0113-5/+82
* | | | | Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' Robert Speicher2016-09-128-6/+42
|\ \ \ \ \
| * | | | | Only add the original author if there isn't a linked GitLab accountAndrew Smith2016-09-088-6/+42
* | | | | | Merge branch 'document-custom-event-tracking' into 'master' Achilleas Pipinellis2016-09-121-0/+15
|\ \ \ \ \ \
| * | | | | | Document how to track custom eventsYorick Peterse2016-09-121-0/+15
* | | | | | | Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ...Rémy Coutable2016-09-124-9/+7
|\ \ \ \ \ \ \
| * | | | | | | Simplify a condition in Repository#update_fileRémy Coutable2016-09-121-1/+1
| * | | | | | | fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-094-9/+7
* | | | | | | | Merge branch 'issue_21825' into 'master' Rémy Coutable2016-09-124-0/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Add information about user and manual build start to runner as variablesSergey Gnuskov2016-09-094-0/+46
* | | | | | | | | Merge branch 'slightly-more-readable' into 'master' Rémy Coutable2016-09-121-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make the cases clear instead of having guardsslightly-more-readableLin Jen-Shin2016-09-121-3/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'sh-defer-resolvable-check' into 'master' Yorick Peterse2016-09-122-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-checkStan Hu2016-09-122-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rc-api-use-search-globalservice-in-projects-search-api' into 'm...Rémy Coutable2016-09-122-12/+4
|\ \ \ \ \ \ \
| * | | | | | | Use Search::GlobalService.new in the `GET /projects/search/:query` endpointrc-api-use-search-globalservice-in-projects-search-apiRémy Coutable2016-09-122-13/+4
| * | | | | | | Search should compare only the lowercase versions of the project namesRazzeee2016-09-092-1/+2
* | | | | | | | Merge branch 'fix-api-sorting' into 'master' Douwe Maan2016-09-123-9/+130
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix API issues sortingfix-api-sortingSean McGivern2016-09-093-9/+130
* | | | | | | | | Merge branch '19359-api-for-notification-settings' into 'master' Rémy Coutable2016-09-127-1/+374
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add notification_settings API callsMarc Siegfriedt2016-09-097-1/+374