summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-02121-508/+871
|\
| * Merge branch 'empty-selection-reply-shortcut' into 'master' Clement Ho2017-02-012-3/+7
| |\
| | * Change the reply shortcut to focus the field even without a selection.Brian Hall2017-01-312-3/+7
| * | Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' into...Filipa Lacerda2017-02-011-10/+16
| |\ \
| | * | Fix permalink discussion note being collapsed27089-26860-27151-fix-discussion-note-permalink-collapsedEric Eastwood2017-01-261-10/+16
| * | | Merge branch 'fix-filtering-username-with-multiple-words' into 'master' Filipa Lacerda2017-02-011-1/+8
| |\ \ \
| | * | | Fix filtering usernames with multiple wordsfix-filtering-username-with-multiple-wordsClement Ho2017-01-271-1/+8
| * | | | Merge branch '27494-environment-list-column-headers' into 'master' Annabel Dunstone Gray2017-02-012-2/+2
| |\ \ \ \
| | * | | | Edited the column header for the environments list from created to updated an...27494-environment-list-column-headersdimitrieh2017-01-312-2/+2
| * | | | | Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-011-9/+5
| |\ \ \ \ \
| | * | | | | Fix testsZ.J. van de Weg2017-01-301-6/+2
| | * | | | | Chat Commands have presentersZ.J. van de Weg2017-01-301-10/+10
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '27484-environment-show-name' into 'master' Fatih Acet2017-01-311-1/+1
| |\ \ \ \ \
| | * | | | | Don't capitalize environment name in show page27484-environment-show-nameFilipa Lacerda2017-01-311-1/+1
| * | | | | | Merge branch '19164-mobile-settings' into 'master' Annabel Dunstone Gray2017-01-312-5/+8
| |\ \ \ \ \ \
| | * | | | | | Remove settings cog from within admin scroll tabs; keep links centered19164-mobile-settingsAnnabel Dunstone Gray2017-01-312-2/+1
| | * | | | | | 19164 Add settings dropdown to mobile screenstauriedavis2017-01-301-4/+8
| * | | | | | | Merge branch '26982-improve-pipeline-status-icon-linking-in-widgets' into 'ma...Annabel Dunstone Gray2017-01-314-5/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Link to pipeline page from commit widget26982-improve-pipeline-status-icon-linking-in-widgetsAnnabel Dunstone Gray2017-01-301-2/+2
| | * | | | | | | Remove underline style for icon hoverAnnabel Dunstone Gray2017-01-302-1/+7
| | * | | | | | | Improve pipeline status icon linking in widgetsdimitrieh2017-01-233-4/+6
| * | | | | | | | Merge branch 'correct-gitlab-host-references' into 'master' Achilleas Pipinellis2017-01-314-6/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Corrected docs href'scorrect-gitlab-host-referencesLuke "Jared" Bennett2017-01-304-6/+5
| * | | | | | | | | Merge branch '23767-disable-storing-of-sensitive-information' into 'master' Filipa Lacerda2017-01-311-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix disable storing of sensitive information when importing a new repo23767-disable-storing-of-sensitive-informationClement Ho2017-01-301-1/+1
| * | | | | | | | | | Merge branch '395-fix-notification-when-group-set-to-watch' into 'master'Sean McGivern2017-01-311-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix notification when global=disabled, group=watch395-fix-notification-when-group-set-to-watchamaia2017-01-301-4/+4
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'fix/27479' into 'master' Sean McGivern2017-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove new branch button for confidential issuesDouglas Barbosa Alexandre2017-01-311-1/+1
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'27283-fix-wrong-label-hide-show-whitespaceSean McGivern2017-01-313-1/+107
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Abillity to promote project labels to group labelsRitave2017-01-313-1/+107
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-...Kamil Trzciński2017-01-317-29/+41
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixes after review25910-convert-manual-action-icons-to-svg-to-propperly-position-themFilipa Lacerda2017-01-261-1/+1
| | * | | | | | | | | Fix broken testsFilipa Lacerda2017-01-251-2/+2
| | * | | | | | | | | Remove unneeded 'borderless' from icons nameFilipa Lacerda2017-01-254-0/+0
| | * | | | | | | | | fixed pipeline graph action buttons and counter badge positioningdimitrieh2017-01-251-23/+19
| | * | | | | | | | | added icons and fixed mini pipeline action dropdown iconsdimitrieh2017-01-257-4/+20
| * | | | | | | | | | Merge branch '26852-fix-slug-for-openshift' into 'master' Kamil Trzciński2017-01-311-5/+13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Avoid repeated dashes in $CI_ENVIRONMENT_SLUGNick Thomas2017-01-231-5/+13
| * | | | | | | | | | | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-313-3/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update #list_teams to propagate errorsZ.J. van de Weg2017-01-304-11/+9
| | * | | | | | | | | | | Added error message and testLuke "Jared" Bennett2017-01-242-1/+4
| | * | | | | | | | | | | Fix inconsistent return typeZ.J. van de Weg2017-01-242-3/+6
| * | | | | | | | | | | | Merge branch '24795_refactor_merge_request_build_service' into 'master' Sean McGivern2017-01-311-57/+72
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | refactor merge request build serviceRydkin Maxim2017-01-311-57/+72
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'remove-warning-to-login' into 'master' Rémy Coutable2017-01-311-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove flash warning from login pagePadilla, Gerald2017-01-301-1/+2
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'Rémy Coutable2017-01-315-7/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Add controller test for merge requests pipelines APIGrzegorz Bizon2017-01-271-1/+2
| | * | | | | | | | | | | Expose serialized pipelines API for merge requestsGrzegorz Bizon2017-01-271-1/+10