summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* allow application.js to require other scripts which start with application*Mike Greiling2017-02-021-1/+1
* Merge branch 'master' into webpackMike Greiling2017-02-0239-86/+168
|\
| * Merge branch '27291-unify-mr-diff-file-buttons' into 'master' Annabel Dunstone Gray2017-02-025-9/+5
| |\
| | * removes old css class from everywhere27291-unify-mr-diff-file-buttonsNur Rony2017-02-023-7/+3
| | * unifies mr diff file button styleNur Rony2017-01-302-2/+2
| * | Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master'Douwe Maan2017-02-021-17/+15
| |\ \
| | * | Be more lenient on build coverage value updates and fix specsLeandro Camargo2017-01-251-1/+1
| | * | Make more code improvements around the '/' stripping logicLeandro Camargo2017-01-251-22/+13
| | * | Improve/polish code logic for some Ci::Build methodsLeandro Camargo2017-01-251-4/+4
| | * | Force coverage value to always be surrounded by '/'Leandro Camargo2017-01-251-3/+7
| | * | Comply to more requirements and requests made in the code reviewLeandro Camargo2017-01-251-1/+1
| | * | Comply to requests made in the review and adjust to the Entry/Node changesLeandro Camargo2017-01-251-3/+3
| | * | Add ability to define a coverage regex in the .gitlab-ci.ymlLeandro Camargo2017-01-251-2/+5
| * | | Merge branch '25811-pipeline-number-and-url-do-not-update-when-new-pipeline-i...Alfredo Sumaran2017-02-024-3/+28
| |\ \ \
| | * | | Update pipeline and commit URL and text on CI status change25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggeredSam Rose2017-02-014-3/+28
| * | | | Merge branch 'snippet-spam' into 'master' Rémy Coutable2017-02-0215-19/+57
| |\ \ \ \
| | * | | | Check public snippets for spamSean McGivern2017-02-029-8/+51
| | * | | | Keep snippet visibility on errorSean McGivern2017-02-027-11/+6
| * | | | | Merge branch 'fix-depr-warn' into 'master' Rémy Coutable2017-02-021-1/+1
| |\ \ \ \ \
| | * | | | | resolve deprecation warningsAdam Pahlevi2017-01-311-1/+1
| * | | | | | Merge branch '27067-mention-user-dropdown-does-not-suggest-by-non-ascii-chara...Filipa Lacerda2017-02-021-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Support non-ASCII characters in GFM autocomplete27067-mention-user-dropdown-does-not-suggest-by-non-ascii-characters-in-namesamrose32017-02-011-2/+2
| * | | | | | 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 'master' into go-go-gadget-webpackMike Greiling2017-01-3170-321/+550
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \