summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolve merge request commentsadd-university-contentSean Packham2016-09-281-5/+5
* Fix linksSean Packham2016-09-271-3/+3
* Resolve merge request commentsSean Packham2016-09-274-35/+27
* Merge branch 'master' into add-university-contentSean Packham2016-09-2712-27/+212
|\
| * Merge branch 'add-calendar-tests' into 'master' Jacob Schatz2016-09-272-9/+101
| |\
| | * Add more tests for calendar contributionClement Ho2016-09-262-9/+101
| * | Merge branch '22053-bump-gitlab-shell-to-have-git-trace' into 'master' Rémy Coutable2016-09-272-1/+2
| |\ \
| | * | Use gitlab-shell v3.6.2 (GIT TRACE logging)22053-bump-gitlab-shell-to-have-git-tracePaco Guzman2016-09-262-1/+2
| * | | Merge branch 'be-nice-to-docker-client' into 'master' Rémy Coutable2016-09-274-9/+28
| |\ \ \
| | * | | Be nice to Docker Clients talking to JWT/authKamil Trzcinski2016-09-274-9/+28
| |/ / /
| * | | Merge branch 'issue-boards-label-filter-fix' into 'master' Fatih Acet2016-09-273-3/+27
| |\ \ \
| | * | | Tests fixissue-boards-label-filter-fixPhil Hughes2016-09-071-0/+2
| | * | | tests updatePhil Hughes2016-09-071-0/+2
| | * | | Fixed issue board label filtering not removing labelsPhil Hughes2016-09-073-3/+23
| * | | | Merge branch 'fix/import-new-models-error' into 'master' Rémy Coutable2016-09-275-5/+54
| |\ \ \ \
| | * | | | fix model order in import/export config and 1to1 relation issue. Added releva...James Lopez2016-09-275-5/+54
| |/ / / /
* | | | | Readded imagesSean Packham2016-09-2715-0/+0
* | | | | Removed lfsSean Packham2016-09-2716-46/+0
* | | | | Fix lint errorSean Packham2016-09-271-1/+1
* | | | | Migrate university to use lfs for imagesSean Packham2016-09-2716-0/+1
* | | | | Merge branch 'master' into add-university-contentSean Packham2016-09-2778-223/+575
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rs-merge_commit_message' into 'master' doc-setup-sshRobert Speicher2016-09-272-7/+41
| |\ \ \ \
| | * | | | Improve how MergeCommit#merge_commit_message builds the messageRobert Speicher2016-09-272-7/+41
| * | | | | Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-2711-7/+49
| |\ \ \ \ \
| | * | | | | Add extra check for api users specDmitriy Zaporozhets2016-09-271-0/+1
| | * | | | | Improvements to user organization field feature after code reviewDmitriy Zaporozhets2016-09-272-17/+1
| | * | | | | Add User#organization to users apiDmitriy Zaporozhets2016-09-274-4/+20
| | * | | | | Dispaly organization name at user pageDmitriy Zaporozhets2016-09-271-1/+5
| | * | | | | Add organization field to user profileDmitriy Zaporozhets2016-09-276-2/+39
| * | | | | | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-275-13/+131
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Inverse condition in Members::ApproveAccessRequestServicerc-new-members-approve-request-access-serviceRémy Coutable2016-09-221-3/+3
| | * | | | | Ensure Members::ApproveAccessRequestService can fin a requester by IDRémy Coutable2016-09-224-3/+13
| | * | | | | New Members::ApproveAccessRequestServiceRémy Coutable2016-09-224-12/+120
| * | | | | | Merge branch 'lfs-helper-doc-link' into 'master' Douwe Maan2016-09-271-3/+5
| |\ \ \ \ \ \
| | * | | | | | Use GitLab Routing helpers for the documentation URL in `LfsHelper`lfs-helper-doc-linkPatricio Cano2016-09-261-3/+5
| * | | | | | | Merge branch '22578-cycle-analytics-incorrect-commit-count'Douwe Maan2016-09-274-16/+45
| |\ \ \ \ \ \ \
| | * | | | | | | Update CHANGELOG22578-cycle-analytics-incorrect-commit-countTimothy Andrew2016-09-261-0/+1
| | * | | | | | | Fix the "Commits" section of the cycle analytics summary.Timothy Andrew2016-09-263-16/+44
| * | | | | | | | Merge branch 'fix-unsubscribe-header'Douwe Maan2016-09-274-3/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Wrap List-Unsubscribe link in angle bracketsfix-unsubscribe-headerSean McGivern2016-09-264-3/+5
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'zj-remove-deprecation-warnings-sprockets' into 'master' Rémy Coutable2016-09-272-6/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Remove Sprockets deprecation warningZ.J. van de Weg2016-09-272-6/+6
| * | | | | | | | Merge branch 'cs-inline-js-search' into 'master' Fatih Acet2016-09-273-31/+47
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Tidy up the code a bitcs-inline-js-searchAlfredo Sumaran2016-08-262-22/+20
| | * | | | | | | | Fix dropdown vertical positionAlfredo Sumaran2016-08-261-1/+1
| | * | | | | | | | Move data attribute information to relevant elements.Connor Shea2016-08-261-11/+9
| | * | | | | | | | Remove inline JavaScript for Search autocomplete.Connor Shea2016-08-262-21/+41
| * | | | | | | | | Merge branch 'cs-upgrade-unicorn' into 'master' Robert Speicher2016-09-272-7/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Upgrade unicorn and unicorn-worker-killer.cs-upgrade-unicornConnor Shea2016-09-212-7/+6
| * | | | | | | | | | Merge branch 'improvement/project-with-board-factory' into 'master' Robert Speicher2016-09-279-24/+23
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |