summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '8836-mr-revert' into 'master' Robert Speicher2017-03-154-13/+6
* Merge branch '29425-fix-activity-stream-first-line-markdown' into 'master' Robert Speicher2017-03-142-3/+3
* Merge branch '28743-actionview-template-error-execjs-disabled-_issuable_meta_...Stan Hu2017-03-141-1/+1
* Merge branch 'add-frequently-used-emojis-back-to-menu' into 'master' Filipa Lacerda2017-03-101-18/+12
* Merge branch 'fix-visual-tokens' into 'master' Alfredo Sumaran2017-03-103-22/+43
* Merge branch '29048-user-wrap-firefox' into 'master' Clement Ho2017-03-101-2/+2
* Merge branch 'diff-avatar-improvements' into 'master' Filipa Lacerda2017-03-102-4/+4
* Merge branch 'fix/gb/passed-with-warnings-status-on-mysql' into 'master' Kamil Trzciński2017-03-102-4/+4
* Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' Kamil Trzciński2017-03-101-0/+2
* Merge branch 'dm-remove-double-project-nav-bar' into 'master' Robert Speicher2017-03-102-1/+1
* Merge branch '29165-subscribe-btn' into 'master' Alfredo Sumaran2017-03-101-3/+1
* Merge branch 'fix-scrolling-settings-tab' into 'master' Filipa Lacerda2017-03-101-1/+1
* Merge branch 'settings-tab' into 'master' Clement Ho2017-03-109-41/+52
* Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master' Filipa Lacerda2017-03-108-350/+360
* Merge branch 'dz-nested-groups-members' into 'master' Dmitriy Zaporozhets2017-03-103-43/+36
* Merge branch 'diff-comments-avatars' into 'master' Jacob Schatz2017-03-1016-51/+420
* Merge branch 'filtered-search-visual-tokens-improvements' into 'master' Alfredo Sumaran2017-03-081-0/+1
|\
| * Code improvementsfiltered-search-visual-tokens-improvementsClement Ho2017-03-071-0/+1
* | Merge branch 'fix-fs-edit-dropdown' into 'master' Alfredo Sumaran2017-03-081-3/+5
|\ \
| * | Fix filtered search visual token editing dropdownfix-fs-edit-dropdownClement Ho2017-03-071-3/+5
| |/
* | Fix edit last visual tokenfix-edit-last-visual-tokenClement Ho2017-03-071-2/+2
|/
* Add filtered search visual tokensfiltered-search-visual-tokensClement Ho2017-03-0712-85/+567
* Returns correct header data for commits endpointOswaldo Ferreira2017-03-071-3/+5
* Manually set total_count when paginating commitsJordan Ryan Reuter2017-03-071-0/+10
* Remove unneccessary blank linesDouwe Maan2017-03-071-1/+0
* Merge branch 'master' into orderable-issuesDouwe Maan2017-03-0789-411/+1379
|\
| * Align bulk update issues button to the rightRémy Coutable2017-03-073-5/+32
| * Merge branch '28230-new-mr-spacing' into 'master' Annabel Dunstone Gray2017-03-0711-92/+66
| |\
| | * consistent spacing on new MR panels28230-new-mr-spacingSimon Knox2017-03-0711-92/+66
| * | Merge branch 'fix-specs-for-access-tokens' into 'master' Douwe Maan2017-03-071-1/+1
| |\ \
| | * | Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-071-1/+1
| * | | Merge branch 'zj-variables-build-job' into 'master' Kamil Trzciński2017-03-071-7/+30
| |\ \ \ | | |/ / | |/| |
| | * | Rename REF to SHAZ.J. van de Weg2017-03-071-1/+1
| | * | Rename BUILD to JOB in CI Variableszj-variables-build-jobZ.J. van de Weg2017-03-071-7/+30
| * | | Merge branch 'zj-chat-teams-unique' into 'master' Kamil Trzciński2017-03-071-0/+1
| |\ \ \
| | * | | Namespace can have only one chat teamzj-chat-teams-uniqueZ.J. van de Weg2017-03-071-0/+1
| | |/ /
| * | | Rename priority sorting option to label priorityDimitrie Hoekstra2017-03-071-1/+1
| * | | Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-...Sean McGivern2017-03-0717-106/+184
| |\ \ \
| | * \ \ Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirro...26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-071892-2868/+3956
| | |\ \ \
| | * | | | Renamed the redirect_request concern to repository_settings_redirectJose Ivan Vargas2017-03-063-3/+3
| | * | | | Removed repository_helper.rbJose Ivan Vargas2017-03-061-22/+0
| | * | | | Fixed repository_controller_specJose Ivan Vargas2017-03-061-4/+7
| | * | | | Added delegations to comply with the new rubocop rulesJose Ivan Vargas2017-03-064-23/+29
| | * | | | Added tests for the repository_controller and repository_helperJose Ivan Vargas2017-03-068-26/+41
| | * | | | Added access spec testsJose Ivan Vargas2017-03-065-24/+12
| | * | | | Introduced the deploy keys presenterGrzegorz Bizon2017-03-066-32/+82
| | * | | | Fixed tests, changed dispatcher routing to the 'repository:show'Jose Ivan Vargas2017-03-065-30/+16
| | * | | | Created the gear settings entry and created a way to initialize both sections...Jose Ivan Vargas2017-03-0610-27/+68
| | * | | | Added repository controller and route for the settings namespaceJose Ivan Vargas2017-03-062-0/+11
| * | | | | Merge branch '27936-avatar-has-wrong-cache-settings' into 'master' Douwe Maan2017-03-071-0/+2
| |\ \ \ \ \
View Lorry Controller Status