summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' Douwe Maan2016-08-231-5/+10
|\
| * Added unfold test to parallel and added 'diff discussion' contextLuke Bennett2016-08-231-1/+1
| * Added addtional 'renderable' validator to check 'data-note-type' attr existsLuke Bennett2016-08-231-5/+10
* | Merge branch 'fix-file-links-on-project-page' into 'master' Douwe Maan2016-08-231-1/+8
|\ \
| * | Fix file links on project page Files viewfix-file-links-on-project-pageSean McGivern2016-08-231-1/+8
* | | Merge branch 'fix-spam-submit-button' into 'master' Robert Speicher2016-08-231-1/+1
|\ \ \
| * | | Also check if Akismet is enabled, before showing the `Submit as spam` button.fix-spam-submit-buttonPatricio Cano2016-08-221-1/+1
| |/ /
* | | Merge branch 'fix-impersonation-log' into 'master' Robert Speicher2016-08-231-1/+1
|\ \ \
| * | | Fix incorrect "stopped impersonation" log messagefix-impersonation-logStan Hu2016-08-231-1/+1
| |/ /
* | | Merge branch '21107-mr-pipeline-404' into 'master' Robert Speicher2016-08-231-11/+11
|\ \ \ | |_|/ |/| |
| * | Fix project namespace links21107-mr-pipeline-404Annabel Dunstone2016-08-201-11/+11
* | | Allow passing an index to selectRowAtIndexAlfredo Sumaran2016-08-231-2/+7
* | | Fixed enter key in search input not workingPhil Hughes2016-08-231-10/+18
| |/ |/|
* | Merge branch 'rs-description-templates-tabindex' into 'master' Robert Speicher2016-08-231-1/+1
|\ \
| * | Remove tab stop from issuable form added by description templatesrs-description-templates-tabindexRobert Speicher2016-08-211-1/+1
* | | Merge branch 'revert_revert_issuable_lock' into 'master' Douwe Maan2016-08-234-2/+24
|\ \ \
| * | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-224-2/+24
| |/ /
* | | fix location of markdown help locationchange-markdown-help-locationJohn Northrup2016-08-221-1/+1
* | | Merge branch 'docs-koding-change-loc' into 'master' Achilleas Pipinellis2016-08-223-5/+2
|\ \ \
| * | | Remove documentation rendering from /koding for nowdocs-koding-change-locAchilleas Pipinellis2016-08-221-3/+0
| * | | Split Koding admin/user docsAchilleas Pipinellis2016-08-222-2/+2
| |/ /
* | | Merge branch 'issue-boards-doc' into 'master' Achilleas Pipinellis2016-08-221-1/+4
|\ \ \
| * | | Remove link to docs from new list textissue-boards-docAchilleas Pipinellis2016-08-221-3/+0
| * | | Change images to reflect current status, add link to inline docsAchilleas Pipinellis2016-08-221-1/+7
| |/ /
* | | Change location of slash commands in notes widgetAchilleas Pipinellis2016-08-221-1/+1
|/ /
* | 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
* | | Fix inputs not being found due to incorrect class in wrap elementce-fix-protected-branchAlfredo Sumaran2016-08-201-2/+2
|/ /
* | Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-201-0/+2
* | Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissionsStan Hu2016-08-201-1/+1
* | Fix assorted rspec failures due to stale, cached user permissionsStan Hu2016-08-201-21/+27
|/
* Merge branch '581-ee-backport-branch-permissions' into 'master' Douwe Maan2016-08-202-14/+19
|\
| * 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
| * 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-201-1/+4
|\ \
| * | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+4
* | | Merge branch 'fix-diff-note-discussion-id' into 'master' Rubén Dávila Santos2016-08-201-0/+3
|\ \ \
| * | | Call `set_discussion_id` again in DiffNote `before_validation` because the or...Douwe Maan2016-08-191-0/+3
| |/ /
* | | Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-196-16/+62
|\ \ \
| * | | Todos sorting dropdownissue_18135Felipe Artur2016-08-196-16/+62
* | | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-1914-2/+149
|\ \ \ \
| * | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-1914-2/+149
* | | | | Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' i...Jacob Schatz2016-08-192-35/+57
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | review changeslbennett/gitlab-ce-17465-search-for-project-with-cursor-keysLuke Bennett2016-08-192-12/+9
| * | | | Fixed conflictsLuke Bennett2016-08-182-16/+13