summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change the way merge request diff compare worksdz-merge-request-versionDmitriy Zaporozhets2016-08-251-18/+6
* Make it more obvious when the user isn't currently viewing the latest mr versionDmitriy Zaporozhets2016-08-251-0/+4
* Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-254-11/+19
* Add changelog item for merge request versions featureDmitriy Zaporozhets2016-08-221-0/+3
* Fix db schema via db:migrate:resetDmitriy Zaporozhets2016-08-221-18/+16
* Disable comments on older merge request diffDmitriy Zaporozhets2016-08-221-0/+5
* Fix merge request diff cache service specDmitriy Zaporozhets2016-08-221-1/+1
* Fix merge request diff apiDmitriy Zaporozhets2016-08-221-1/+1
* Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-223-19/+24
* Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-22211-563/+2637
|\
| * Merge branch 'fix-empty-dropdown' into 'master' Rubén Dávila Santos2016-08-214-5/+12
| |\
| | * Set default label if user unselects the option from dropdownfix-empty-dropdownAlfredo Sumaran2016-08-211-2/+6
| | * Toggle dropdown disabled attributeAlfredo Sumaran2016-08-211-3/+1
| | * Do not update if one dropdown has not selected any optionAlfredo Sumaran2016-08-211-0/+3
| | * Make dropdown selectablesAlfredo Sumaran2016-08-211-0/+2
| * | Merge branch 'ce-fix-protected-branch' into 'master' Rubén Dávila Santos2016-08-211-2/+2
| |\ \ | | |/ | |/|
| | * Fix inputs not being found due to incorrect class in wrap elementce-fix-protected-branchAlfredo Sumaran2016-08-201-2/+2
| |/
| * Merge branch 'fix-network-graph-error-500' into 'master' Rubén Dávila Santos2016-08-202-0/+14
| |\
| | * Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-202-0/+14
| |/
| * Merge branch 'fix-rspec-failures-due-to-cached-permissions' into 'master' Rubén Dávila Santos2016-08-202-21/+91
| |\
| | * Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissionsStan Hu2016-08-202-10/+11
| | * Add spec for Ability.project_abilitiesStan Hu2016-08-201-0/+63
| | * Fix assorted rspec failures due to stale, cached user permissionsStan Hu2016-08-201-21/+27
| |/
| * Merge branch 'gitlab_shell_version_update' into 'master' Marin Jankovski2016-08-202-2/+2
| |\
| | * Update gitlab-shell to v3.4.0gitlab_shell_version_updateMarin Jankovski2016-08-202-2/+2
| |/
| * Merge branch '581-ee-backport-branch-permissions' into 'master' Douwe Maan2016-08-204-83/+92
| |\
| | * Add element container to dropdowns581-ee-backport-branch-permissionsAlfredo Sumaran2016-08-191-6/+8
| | * Use typeof instead of Underscore methodAlfredo Sumaran2016-08-191-2/+2
| | * Move protected branches access control spec into a shared example.Timothy Andrew2016-08-202-69/+73
| | * check if selectedObject is definedAlfredo Sumaran2016-08-191-1/+1
| | * make input name to be a functionAlfredo Sumaran2016-08-191-8/+11
| * | Merge branch 'disable-issue-by-email' into 'master' Robert Speicher2016-08-206-6/+9
| |\ \
| | * | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-196-6/+9
| * | | Merge branch 'fix-diff-note-discussion-id' into 'master' Rubén Dávila Santos2016-08-204-1/+31
| |\ \ \
| | * | | Call `set_discussion_id` again in DiffNote `before_validation` because the or...Douwe Maan2016-08-194-1/+31
| | |/ /
| * | | Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-199-16/+200
| |\ \ \
| | * | | Todos sorting dropdownissue_18135Felipe Artur2016-08-199-16/+200
| * | | | Update CHANGELOG for 8.10.7, 8.9.8, and 8.8.9Robert Speicher2016-08-191-0/+10
| * | | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-1938-3/+552
| |\ \ \ \
| | * | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-1938-3/+552
| * | | | | Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' i...Jacob Schatz2016-08-195-39/+196
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | review changeslbennett/gitlab-ce-17465-search-for-project-with-cursor-keysLuke Bennett2016-08-192-12/+9
| | * | | | Fixed conflictsLuke Bennett2016-08-183-18/+15
| | * | | | Fixed specsLuke Bennett2016-08-182-6/+7
| | * | | | Fixed spec and improved formattingLuke Bennett2016-08-183-31/+28
| | * | | | Improved spec, waiting on sprockets-es6 to work with rspec....Luke Bennett2016-08-181-92/+94
| | * | | | Moved changes across to es5 and changed spec to es6Luke Bennett2016-08-186-1131/+175
| | * | | | Fix failed testsLuke "Jared" Bennett2016-08-181-1/+1
| | * | | | Further review changes and removed large ammounts of reformattingLuke "Jared" Bennett2016-08-182-107/+132
| | * | | | Fixed test turbolink conditionLuke "Jared" Bennett2016-08-182-8/+9