summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Review changes and final formattingLuke "Jared" Bennett2016-08-181-140/+115
| * | | | improved turbolinks.visit conditionalLuke "Jared" Bennett2016-08-181-1/+1
| * | | | Added new non-selectable selector exclusions to fix arrow key events, fixed t...Luke Bennett2016-08-184-0/+1118
* | | | | Merge branch 'mark-as-processable' into 'master' Robert Speicher2016-08-194-3/+52
|\ \ \ \ \
| * | | | | Fix rubocop offense in pipeline modelmark-as-processableGrzegorz Bizon2016-08-191-1/+1
| * | | | | Fix test for processing pipeline after retrying buildGrzegorz Bizon2016-08-191-1/+1
| * | | | | Add test that shows problem with pipeline processingGrzegorz Bizon2016-08-191-3/+43
| * | | | | Make all future skipped builds as processable when retrying a buildKamil Trzcinski2016-08-183-0/+9
* | | | | | Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-af...Douwe Maan2016-08-192-8/+32
|\ \ \ \ \ \
| * | | | | | Don't log to STDOUT in specs21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-pushSean McGivern2016-08-191-0/+1
| * | | | | | Fix force-push message in push emailsSean McGivern2016-08-192-8/+31
* | | | | | | Merge branch 'fix-discussions-on-changed-lines' into 'master' Robert Speicher2016-08-195-1/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix bug where notes weren’t shown in discussion when the code had changed a...Douwe Maan2016-08-195-1/+14
* | | | | | | | Merge branch 'issue-boards-label-text-color' into 'master' Robert Speicher2016-08-193-17/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix JSON schema to issues in issue board listsissue-boards-label-text-colorDouglas Barbosa Alexandre2016-08-191-16/+24
| * | | | | | | | Added text color to issues labels in issue board listsPhil Hughes2016-08-192-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'directory-names-containing-space' into 'master' Robert Speicher2016-08-193-20/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not escape URI when extracting path (!5878)winniehell2016-08-193-20/+4