summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sticky-mr-tabs-pinned-nav' into 'master' Fatih Acet2016-10-281-0/+12
|\
| * Fixed sticky MR tabs positioning when sidebar is pinnedsticky-mr-tabs-pinned-navPhil Hughes2016-10-291-0/+12
* | Merge branch 'dropdown-input-fix' into 'master' Fatih Acet2016-10-281-3/+8
|\ \ | |/ |/|
| * Do not allow text input in dropdown while loadingIdo Leibovich2016-10-281-3/+8
* | Merge branch '23849-pipeline-graph-bug' into 'master' Fatih Acet2016-10-281-2/+1
|\ \
| * | Only remove right connector of first build of last stage23849-pipeline-graph-bugAnnabel Dunstone Gray2016-10-281-2/+1
* | | Merge branch 'dz-internal-api-fullpath' into 'master' Dmitriy Zaporozhets2016-10-281-0/+14
|\ \ \
| * | | Refactor storage path extraction from full repo pathdz-internal-api-fullpathDmitriy Zaporozhets2016-10-281-0/+14
* | | | Merge branch 'cycle-analytics-bundle' into 'master' Fatih Acet2016-10-282-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Create cycle analytics bundlePhil Hughes2016-10-282-0/+4
* | | | Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master' Sean McGivern2016-10-289-8/+35
|\ \ \ \
| * | | | add "x of y tasks completed" on issuableGuilherme Salazar2016-10-289-8/+35
* | | | | Merge branch 'ee-1159-allow-permission-check-bypass-in-approve-access-request...Stan Hu2016-10-281-5/+16
|\ \ \ \ \
| * | | | | Allow Members::ApproveAccessRequestService to accept a new :force paramee-1159-allow-permission-check-bypass-in-approve-access-request-serviceRémy Coutable2016-10-281-5/+16
* | | | | | Merge branch '23872-members-of-group-that-has-project-access-getting-404-on-a...Rémy Coutable2016-10-281-8/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix project member access for group linksSean McGivern2016-10-281-8/+2
| |/ / / /
* | | | | Merge branch 'adam-fix-labels-find-or-create' into 'master' Douwe Maan2016-10-283-13/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-283-13/+15
| |/ / /
* | | | Merge branch 'use-optimistic-locking' into 'master' Stan Hu2016-10-284-31/+27
|\ \ \ \
| * | | | Make retry_lock to not be infiniteuse-optimistic-lockingKamil Trzcinski2016-10-271-2/+2
| * | | | Fix Rubocop unused variables warningStan Hu2016-10-261-2/+2
| * | | | Remove puts to solve Rubocop errorsStan Hu2016-10-261-2/+0
| * | | | Fix optimistic lockingKamil Trzcinski2016-10-262-8/+10
| * | | | Add tests for optimistic lockingKamil Trzcinski2016-10-262-2/+2
| * | | | Use optimistic lockingKamil Trzcinski2016-10-263-25/+21
* | | | | Fixed boards store specissue-board-welcome-cookie-monsterPhil Hughes2016-10-281-2/+1
* | | | | Delete issue board welcome cookie when project is newPhil Hughes2016-10-282-2/+6
| |_|/ / |/| | |
* | | | Merge branch 'fix/make-github-import-retryable' into 'master' Sean McGivern2016-10-281-1/+1
|\ \ \ \
| * | | | Check if repository already exists before trying to re-import itAhmad Sherif2016-10-281-1/+1
| | |/ / | |/| |
* | | | Merge branch '5905-duplicate-email-errors' into 'master' Rémy Coutable2016-10-281-1/+3
|\ \ \ \
| * \ \ \ Merge branch 'master' into 5905-duplicate-email-errorsSteve Halasz2016-10-27283-372/+1348
| |\ \ \ \
| * | | | | Only show one error message for an invalid emailSteve Halasz2016-10-271-1/+3
* | | | | | Merge branch 'bugfix/dragging_milestones' into 'master' Sean McGivern2016-10-282-2/+3
|\ \ \ \ \ \
| * | | | | | Stop unauthorized users dragging on milestone pageblackst0ne2016-10-282-2/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '23928-sortable-highest_label_priority-is-bugged' into 'master' Rémy Coutable2016-10-282-4/+9
|\ \ \ \ \ \
| * | | | | | Fix and improve `Sortable.highest_label_priority`23928-sortable-highest_label_priority-is-buggedAlejandro Rodríguez2016-10-272-4/+9
| |/ / / / /
* | | | | | Merge branch 'issue_1008_1' into 'master' Sean McGivern2016-10-287-137/+123
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Finish updates to use JIRA gemFelipe Artur2016-10-266-69/+64
| * | | | | Refactor JIRA service to use gemDrew Blessing2016-10-262-106/+97
* | | | | | edited stylesheet with mr modal fixes and added to changelogmodal-mergerequest-shorten-clipboardDimitrie Hoekstra2016-10-271-0/+4
| |_|/ / / |/| | | |
* | | | | Merge branch 'fix-linting' into 'master' Jacob Schatz2016-10-274-0/+4
|\ \ \ \ \
| * | | | | Enable linting for ES6 fileswinniehell2016-10-274-0/+4
* | | | | | Merge branch 'doc/improve-coverage-badge-docs' into 'master' Achilleas Pipinellis2016-10-271-21/+36
|\ \ \ \ \ \
| * | | | | | Use better wording for test coverage parsing help textAchilleas Pipinellis2016-10-271-2/+2
| * | | | | | Rearrange the Pipelines settings page sections and link to docsAchilleas Pipinellis2016-10-271-19/+34
* | | | | | | Merge branch 'dz-revert-revert' into 'master' Dmitriy Zaporozhets2016-10-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather tha...dz-revert-revertDmitriy Zaporozhets2016-10-271-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '23866-builds-dropdown' into 'master' Fatih Acet2016-10-271-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Increase z index on fixed mr tabsAnnabel Dunstone Gray2016-10-261-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'add-todo-toggle-event' into 'master' remove-tooltip-text-truncation-from-pipeline-graph-build-node-tooltipsFatih Acet2016-10-276-11/+24
|\ \ \ \ \ \