summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Upgrade to task_list v2Jared Deckard2017-05-231-1/+1
* Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' i...Fatih Acet2017-05-231-3/+2
|\
| * ensure MergeRequestStore sha value never changes after instantiation32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widgetMike Greiling2017-05-171-3/+2
* | Merge branch 'zj-sort-env-folders' into 'master'Kamil Trzciński2017-05-231-0/+1
|\ \
| * | Sort environments folders when opening themZ.J. van de Weg2017-05-171-0/+1
* | | Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-234-9/+25
|\ \ \
| * | | Refactored transfer_service #execute actionprevent-project-transferJose Ivan Vargas2017-05-221-10/+6
| * | | minor adjustments to the specsJose Ivan Vargas2017-05-221-1/+1
| * | | Renamed some messages and refactored the project_edit class to a functionJose Ivan Vargas2017-05-224-19/+12
| * | | Prevent project transfer if a new group is not selectedJose Ivan Vargas2017-05-224-5/+32
* | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master'Fatih Acet2017-05-222-6/+2
|\ \ \ \
| * | | | Change links to issuable meta to blackAnnabel Dunstone Gray2017-05-192-6/+2
* | | | | Merge branch '32486-fix-note-emoji-placement' into 'master'Annabel Dunstone Gray2017-05-221-4/+0
|\ \ \ \ \
| * | | | | 32486 Fix placement of note emoji on hover32486-fix-note-emoji-placementtauriedavis2017-05-221-4/+0
* | | | | | Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-222-7/+15
|\ \ \ \ \ \
| * | | | | | MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-222-7/+15
* | | | | | | Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-223-4/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix spacing of issue emojis32631-issue-emoji-wrapAnnabel Dunstone Gray2017-05-193-4/+8
* | | | | | | | Merge branch 'ce#32623-browser-tooltip-commits-branch-list' into 'master'Annabel Dunstone Gray2017-05-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 32623 Change order of commits ahead and behind on divergence graph for branch...ce#32623-browser-tooltip-commits-branch-listtauriedavis2017-05-191-1/+1
* | | | | | | | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into 'm...Phil Hughes2017-05-221-2/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix jQuery data attribute caching issue casuing expanding issuesEric Eastwood2017-05-221-2/+3
* | | | | | | | | Merge branch '32570-project-activity-tab-border' into 'master'Annabel Dunstone Gray2017-05-223-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 32570 Fix border-bottom for project activity tab32570-project-activity-tab-bordertauriedavis2017-05-193-4/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'update-coding-translation' into 'master'Douwe Maan2017-05-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change translation for 'coding' by 'desarrollo' for Spanishupdate-coding-translationRuben Davila2017-05-201-1/+1
* | | | | | | | | | Merge branch 'adopt-es-module-syntax' into 'master'Filipa Lacerda2017-05-2246-165/+143
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | fix eslint violationadopt-es-module-syntaxMike Greiling2017-05-181-1/+1
| * | | | | | | | | refactor instances of CJS module.exports to ES module syntaxMike Greiling2017-05-165-11/+4
| * | | | | | | | | fix eslint failuresMike Greiling2017-05-161-2/+1
| * | | | | | | | | update dispatcher.js to use ES module syntaxMike Greiling2017-05-161-3/+1
| * | | | | | | | | update remaining uses of CJS syntax to ES module syntaxMike Greiling2017-05-1620-59/+64
| * | | | | | | | | update shortcuts scripts to use ES module syntaxMike Greiling2017-05-165-7/+7
| * | | | | | | | | update filtered_search to ES module syntaxMike Greiling2017-05-165-17/+14
| * | | | | | | | | update diff_notes_bundle to ES module syntaxMike Greiling2017-05-162-18/+13
| * | | | | | | | | update cycle_analytics_bundle to ES module syntaxMike Greiling2017-05-162-15/+14
| * | | | | | | | | update boards_bundle to ES module syntaxMike Greiling2017-05-167-33/+25
* | | | | | | | | | Merge branch 'dz-rename-pipelines-settings-tab' into 'master'Dmitriy Zaporozhets2017-05-225-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename CI/CD Pipelines references to just Pipelines in docsdz-rename-pipelines-settings-tabDmitriy Zaporozhets2017-05-112-2/+2
| * | | | | | | | | | Rename CI/CD Pipelines to Pipelines in the project settingsDmitriy Zaporozhets2017-05-114-5/+5
* | | | | | | | | | | Change pipelines schedules help page pathchange_pipelines_schedules_help_page_pathAchilleas Pipinellis2017-05-221-2/+2
* | | | | | | | | | | Show password field mask while editing service settingsKushal Pandya2017-05-221-2/+2
* | | | | | | | | | | Merge branch '32496-admin-tabs' into 'master'Phil Hughes2017-05-221-35/+36
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix admin tabs32496-admin-tabsAnnabel Dunstone Gray2017-05-181-35/+36
* | | | | | | | | | | Merge branch '32462-award-emoji-tooltip-should-be-add-reaction' into 'master'Annabel Dunstone Gray2017-05-213-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rename "Add emoji" and "Award emoji" to "Add reaction" where appropriate32462-award-emoji-tooltip-should-be-add-reactionMike Greiling2017-05-193-4/+4
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/gb/exclude-manual-actions-from-cancelable-jobs' into 'master'Kamil Trzciński2017-05-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobsGrzegorz Bizon2017-05-191-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Add users endpoint to frontend API classWinnie Hellmann2017-05-1912-114/+138
* | | | | | | | | | Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan2017-05-191-1/+4
|\ \ \ \ \ \ \ \ \ \