summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Limit OpenGraph image size to 64x64dm-page-image-sizeDouwe Maan2017-06-281-0/+2
|
* Merge branch ↵Douwe Maan2017-06-281-1/+0
|\ | | | | | | | | | | | | 'delete_esperanto_translations_of_json_files_generated_from_po_files' into 'master' Delete esperanto translations of json files generated from po files See merge request !12516
| * delete Esperanto translations of JSON files generated from PO files黄涛2017-06-281-1/+0
| |
* | Merge branch 'winh-no-current-user-search-bar' into 'master'Clement Ho2017-06-283-7/+11
|\ \ | | | | | | | | | | | | Add condition if there is a current user to DropdownUser See merge request !12415
| * | Introduce addClassIfElementExists utilitywinh-no-current-user-search-barwinh2017-06-273-10/+11
| | |
| * | Add condition if there is a current user to DropdownUserwinh2017-06-271-2/+5
| | |
* | | Merge branch 'port-changes-ee-2467' into 'master'Douwe Maan2017-06-282-0/+8
|\ \ \ | | | | | | | | | | | | | | | | Port of "2467-repository-sync-dirty-projects" to CE See merge request !12523
| * | | Add ProjectWiki#ensure_repositoryport-changes-ee-2467Douglas Barbosa Alexandre2017-06-281-0/+4
| | | |
| * | | Add Project#ensure_repositoryDouglas Barbosa Alexandre2017-06-281-0/+4
| | | |
* | | | Merge branch 'cherry-pick-5ea675be' into 'master'Tim Zallmann2017-06-2817-739/+1228
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch' See merge request !12454
| * | | | Merge branch 'additional-metrics-dashboard' into ↵Phil Hughes2017-06-2617-739/+1228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740
* | | | | Merge branch 'profile-settings-width' into 'master'Annabel Dunstone Gray2017-06-2815-40/+56
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Added limited width to profile settings Closes #20918 See merge request !12386
| * | | | Added limited width to profile settingsprofile-settings-widthPhil Hughes2017-06-2315-40/+56
| | | | | | | | | | | | | | | | | | | | Closes #20918
* | | | | Merge branch 'stop-notification-recipient-service-modifying-participants' ↵Grzegorz Bizon2017-06-281-7/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure NotificationRecipientService doesn't modify participants See merge request !12517
| * | | | | Ensure NotificationRecipientService doesn't modify participantsSean McGivern2017-06-281-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though it does modify the participants of the notification target in some cases, this should have been safe, as different workers are responsible for creating the notifications for each target. However, this is at best confusing, and we should ensure we don't do that.
* | | | | | Merge branch 'fix-find-file-breadcrumbs' into 'master'Tim Zallmann2017-06-282-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix find file breadcrumb styling Closes #34427 See merge request !12510
| * | | | | | Fix find file breadcrumb stylingfix-find-file-breadcrumbsPhil Hughes2017-06-282-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes #34427
* | | | | | Merge branch 'issue-boards-closed-list-all' into 'master'Sean McGivern2017-06-281-2/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards closed list not listing all issues Closes #33850 See merge request !12271
| * | | | | Fixed issue boards closed list not listing all issuesPhil Hughes2017-06-281-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression caused by the backlog list being re-added Closes #33850
* | | | | | Merge branch '34430-fix-double-escape-comment-edit' into 'master'Phil Hughes2017-06-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary call to `_.escape` Closes #34430 See merge request !12505
| * | | | | | Remove unnecessary call to `_.escape`34430-fix-double-escape-comment-editkushalpandya2017-06-281-1/+1
| | | | | | |
* | | | | | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-281-16/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Make Gitlab::Git::Repository#submodules private See merge request !12479
| * | | | | | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-271-16/+0
| | | | | | |
* | | | | | | Resolve "Navigation - Move contextual navigation to sidebar"Annabel Dunstone Gray2017-06-2812-12/+623
| | | | | | |
* | | | | | | Merge branch 'backport-inline-loading-icon' into 'master'Phil Hughes2017-06-281-2/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport inline prop on loading_icon from EE See merge request !12490
| * | | | | | | Backport inline loading_icon updates from EEbackport-inline-loading-iconEric Eastwood2017-06-271-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2246#note_33577729
* | | | | | | | Merge branch 'refactor-emoji-utils' into 'master'Tim Zallmann2017-06-289-170/+137
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Refactor emoji helpers in preparation for async loading See merge request !12432
| * | | | | | | revert removal of requestAnimationFrame and move to a separate MR/discussionrefactor-emoji-utilsMike Greiling2017-06-271-2/+8
| | | | | | | |
| * | | | | | | rename getEmojiCategoryMap and remove unnecessary parameterMike Greiling2017-06-272-9/+9
| | | | | | | |
| * | | | | | | move glEmojiTag method to emoji helperMike Greiling2017-06-275-86/+67
| | | | | | | |
| * | | | | | | split emoji support methods from the async moduleMike Greiling2017-06-275-10/+14
| | | | | | | |
| * | | | | | | export validEmojiNames for autocompleteMike Greiling2017-06-262-2/+3
| | | | | | | |
| * | | | | | | replace emojiAlias references with normalizeEmojiName helperMike Greiling2017-06-261-5/+3
| | | | | | | |
| * | | | | | | namespace emoji helper methods within AwardsHandler classMike Greiling2017-06-261-13/+8
| | | | | | | |
| * | | | | | | move emoji category index to helper methodMike Greiling2017-06-262-27/+32
| | | | | | | |
| * | | | | | | move emojiAlias logic into helper moduleMike Greiling2017-06-262-16/+17
| | | | | | | |
| * | | | | | | fix method definition stylingMike Greiling2017-06-261-12/+2
| | | | | | | |
| * | | | | | | move normalizeEmojiName method to emoji helper moduleMike Greiling2017-06-263-20/+14
| | | | | | | |
| * | | | | | | remove problematic use of requestAnimationFrameMike Greiling2017-06-261-8/+2
| | | | | | | |
| * | | | | | | centralize emoji helper methodsMike Greiling2017-06-237-21/+22
| | | | | | | |
| * | | | | | | refactor option defaultsMike Greiling2017-06-231-5/+2
| | | | | | | |
* | | | | | | | Ignore JSON files generated from PO filesRuben Davila2017-06-279-9/+0
| | | | | | | |
* | | | | | | | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵Robert Speicher2017-06-272-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443
| * | | | | | | | Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nilRuben Davila2017-06-262-2/+2
| | | | | | | | |
* | | | | | | | | Slightly refactor pipeline schedules form in preparation for additionsBryce Johnson2017-06-273-155/+172
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-commit-row-browse-button' into 'master'Robert Speicher2017-06-271-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust commit partial cache key to fix browse buttons Closes #26899 See merge request !12393
| * | | | | | | | | Adjust commit partial cache key to fix browse buttonsDouwe Maan2017-06-221-1/+1
| | | | | | | | | |
* | | | | | | | | | Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter ↵Luke "Jared" Bennett2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submits twice and refreshes page"
* | | | | | | | | | Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up Gitlab::Git::Commit.find_all See merge request !12476
| * | | | | | | | | | Remove Gitlab::Git::Repository#find_allJacob Vosmaer2017-06-271-1/+1
| | | | | | | | | | |