summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix the leak mentioned in 504a3b5 by another wayfix/memory-leak-sanitization-filterAhmad Sherif2016-09-212-29/+32
* Revert "Fix a memory leak caused by Banzai::Filter::SanitizationFilter"Ahmad Sherif2016-09-211-3/+1
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-09-213-2/+23
|\
| * Merge branch 'fix/import-security-specs' into 'master' Rémy Coutable2016-09-213-2/+23
| |\
| | * fixing security specs after mergeJames Lopez2016-09-213-2/+23
* | | Merge branch 'rs-revert-rubocop-rspec-1-7' into 'master' Robert Speicher2016-09-213-71/+14
|\ \ \
| * | | Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'"rs-revert-rubocop-rspec-1-7Robert Speicher2016-09-213-71/+14
| |/ /
* | | Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-2121-52/+184
|\ \ \
| * | | Remove duplicate routeand-you-get-awardsZeger-Jan van de Weg2016-09-201-1/+0
| * | | Fix styling of award emoji block for snippets after upstream design changes.Fatih Acet2016-09-193-11/+19
| * | | Use routing concerns to DRY the routesZ.J. van de Weg2016-09-191-9/+9
| * | | Fix tests for Snippets toggling awardsZ.J. van de Weg2016-09-198-939/+32
| * | | Start Frontend work, fix routing problemZ.J. van de Weg2016-09-1910-11/+937
| * | | API docs for award emoji on SnippetsZ.J. van de Weg2016-09-191-5/+10
| * | | API support for Award Emoji on SnippetsZ.J. van de Weg2016-09-193-16/+71
| * | | Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-199-6/+52
* | | | Merge branch 'correct-builds-pipeline-commit-header-to-build-header' into 'ma...Fatih Acet2016-09-211-1/+1
|\ \ \ \
| * | | | Changed `Commit` to `Build` headercorrect-builds-pipeline-commit-header-to-build-headerLuke Bennett2016-09-181-1/+1
* | | | | Merge branch 'rs-simplify-fetch_members' into 'master' Rémy Coutable2016-09-213-32/+108
|\ \ \ \ \
| * | | | | Simplify invited_group_members filter-by-levelRobert Speicher2016-09-211-6/+6
| * | | | | Use `public_send` over `send` in ProjectTeamRobert Speicher2016-09-211-3/+3
| * | | | | Improve clarity of variable names in ProjectTeam#fetch_invited_membersrs-simplify-fetch_membersRobert Speicher2016-09-201-14/+12
| * | | | | Fix a logic error in ProjectTeam#fetch_invited_membersRobert Speicher2016-09-202-2/+3
| * | | | | Simplify ProjectTeam#fetch_members to satisfy flogRobert Speicher2016-09-201-30/+40
| * | | | | Add specs for ProjectTeam#fetch_membersRobert Speicher2016-09-202-0/+67
* | | | | | Merge branch 'shrink-profile-info' into 'master' Fatih Acet2016-09-215-61/+89
|\ \ \ \ \ \
| * | | | | | clean up profileshrink-profile-infotauriedavis2016-09-163-56/+82
| * | | | | | shrink profile infotauriedavis2016-09-164-37/+39
* | | | | | | Merge branch 'show-all-pipelines-from-all-diffs' into 'master' Rémy Coutable2016-09-214-10/+79
|\ \ \ \ \ \ \
| * | | | | | | Use factory instead of using new directly. Feedback:show-all-pipelines-from-all-diffsLin Jen-Shin2016-09-211-9/+2
| * | | | | | | Add a test for non-persisted merge requestLin Jen-Shin2016-09-201-0/+22
| * | | | | | | If merge request wasn't persisted yet, we show only 1 pipeline:Lin Jen-Shin2016-09-201-7/+11
| * | | | | | | Test against MergeRequest#all_commits_sha, feedback:Lin Jen-Shin2016-09-201-9/+22
| * | | | | | | slightly tweak about the comment, feedback:Lin Jen-Shin2016-09-201-1/+1
| * | | | | | | Introduce MergeRequest#all_commits_sha, feedback:Lin Jen-Shin2016-09-201-8/+9
| * | | | | | | Add an entry to CHANGELOG [ci skip]Lin Jen-Shin2016-09-201-0/+1
| * | | | | | | Show all pipelines from all merge_request_diffs:Lin Jen-Shin2016-09-193-9/+44
* | | | | | | | Merge branch 'limit-number-of-shown-environments' into 'master' Rémy Coutable2016-09-218-21/+130
|\ \ \ \ \ \ \ \
| * | | | | | | | Scope environments to projectlimit-number-of-shown-environmentsKamil Trzcinski2016-09-214-2/+8
| * | | | | | | | Improve specsKamil Trzcinski2016-09-212-4/+5
| * | | | | | | | Fix project for merge_request environmentsKamil Trzcinski2016-09-211-1/+1
| * | | | | | | | Add tests to verify the correctness of returned environmentsKamil Trzcinski2016-09-216-11/+93
| * | | | | | | | Limit number of shown environments for Merge RequestsKamil Trzcinski2016-09-213-14/+34
* | | | | | | | | Merge branch '20310-new-project-btn' into 'master' Jacob Schatz2016-09-213-3/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fix new project button alignment20310-new-project-btnAnnabel Dunstone Gray2016-09-143-3/+15
* | | | | | | | | Add 8.11.7, 8.10.10, and 8.9.10 CHANGELOG entriesRémy Coutable2016-09-211-0/+11
* | | | | | | | | Merge branch 'vitalybaev/gitlab-ce-build-page-sidebar-coverage-horizontal-pad...Rémy Coutable2016-09-212-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Added horizontal padding on build page sidebar on code coverage blockVitaly Baev2016-09-212-0/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'add_spec_for_committer_hash' into 'master' Rémy Coutable2016-09-214-1/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Add spec covering 'committer_hash'Dan Dunckel2016-09-204-1/+49
View Lorry Controller Status