summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix dropdowns for mr-versionsfix-mr-version-dropdownstauriedavis2016-09-221-34/+38
* Merge branch 'fix-pipeline-for-empty-merge-request-diff' into 'master' Rémy Coutable2016-09-223-7/+48
|\
| * Add test for MergeRequestDiff#commits_sha, feedback:Lin Jen-Shin2016-09-221-0/+22
| * So that st_commits could never be nilLin Jen-Shin2016-09-221-4/+6
| * For empty merge_request_diff st_commits would be nilfix-pipeline-for-empty-merge-request-diffLin Jen-Shin2016-09-222-7/+24
* | Merge branch 'bpj-merge-request-diff-fixes' into 'master' Rémy Coutable2016-09-223-9/+6
|\ \
| * | Stop disabling jump_to_next buttons, when not on latest MR diff.bpj-merge-request-diff-fixesBryce Johnson2016-09-221-3/+1
| * | Remove colons in dropdowns, use icon helper, and fix 'Show original' link.Bryce Johnson2016-09-222-6/+5
* | | Merge branch 'dz-improve-mr-versions-doc' into 'master' Rémy Coutable2016-09-224-1/+5
|\ \ \
| * | | Update merge request versions documentation with new screenshotsdz-improve-mr-versions-docDmitriy Zaporozhets2016-09-214-1/+5
* | | | Merge branch '22421-fix-issuable-counter-when-more-than-one-label-is-selected...Rémy Coutable2016-09-222-9/+26
|\ \ \ \
| * | | | Hotfix the issuable counters when filtering by multiple labels22421-fix-issuable-counter-when-more-than-one-label-is-selectedRémy Coutable2016-09-222-9/+26
| | |/ / | |/| |
* | | | Merge branch 'update-db-schema' into 'master' Rémy Coutable2016-09-221-4/+5
|\ \ \ \
| * | | | Update db/schema.rb per most recent migrationsupdate-db-schemaYorick Peterse2016-09-211-4/+5
* | | | | Merge branch 'sh-bump-gitlab-shell-8.12' into 'master' Achilleas Pipinellis2016-09-221-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bump gitlab-shell upgrade version to 3.6.0 for 8.12sh-bump-gitlab-shell-8.12Stan Hu2016-09-221-1/+1
|/ / / /
* | | | Merge branch 'docs/cycle-analytics' into 'master' merge-request-push-compare-uiAchilleas Pipinellis2016-09-221-6/+8
|\ \ \ \
| * | | | Fix typos in cycle analytics docsAchilleas Pipinellis2016-09-221-6/+8
| | |/ / | |/| |
* | | | Merge branch 'docs/issue-closing-pattern' into 'master' Achilleas Pipinellis2016-09-228-44/+114
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change location and refactor issue closing pattern documentationAchilleas Pipinellis2016-09-228-44/+114
| |/ /
* | | Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"Rubén Dávila Santos2016-09-222-5/+0
* | | Merge branch 'reorganize_sections_in_admin_settings' into 'master' Achilleas Pipinellis2016-09-211-22/+32
|\ \ \
| * | | Reorganize sections in Admin area settingsreorganize_sections_in_admin_settingsAchilleas Pipinellis2016-09-211-22/+32
| |/ /
* | | fix import/export security specs after mergeJames Lopez2016-09-213-1/+15
| |/ |/|
* | Merge branch 'zj-default-setting-features' into 'master' Robert Speicher2016-09-211-0/+6
|\ \
| * | Remove duplicate default_value_level entryzj-default-setting-featuresZeger-Jan van de Weg2016-09-211-1/+0
| * | Add default values for ProjectFeatureZ.J. van de Weg2016-09-211-0/+7
| |/
* | 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
View Lorry Controller Status