Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Limit OpenGraph image size to 64x64dm-page-image-size | Douwe Maan | 2017-06-28 | 1 | -0/+2 |
| | |||||
* | Merge branch ↵ | Douwe Maan | 2017-06-28 | 1 | -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-28 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'winh-no-current-user-search-bar' into 'master' | Clement Ho | 2017-06-28 | 3 | -7/+11 |
|\ \ | | | | | | | | | | | | | Add condition if there is a current user to DropdownUser See merge request !12415 | ||||
| * | | Introduce addClassIfElementExists utilitywinh-no-current-user-search-bar | winh | 2017-06-27 | 3 | -10/+11 |
| | | | |||||
| * | | Add condition if there is a current user to DropdownUser | winh | 2017-06-27 | 1 | -2/+5 |
| | | | |||||
* | | | Merge branch 'port-changes-ee-2467' into 'master' | Douwe Maan | 2017-06-28 | 2 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | Port of "2467-repository-sync-dirty-projects" to CE See merge request !12523 | ||||
| * | | | Add ProjectWiki#ensure_repositoryport-changes-ee-2467 | Douglas Barbosa Alexandre | 2017-06-28 | 1 | -0/+4 |
| | | | | |||||
| * | | | Add Project#ensure_repository | Douglas Barbosa Alexandre | 2017-06-28 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge branch 'cherry-pick-5ea675be' into 'master' | Tim Zallmann | 2017-06-28 | 17 | -739/+1228 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch' See merge request !12454 | ||||
| * | | | | Merge branch 'additional-metrics-dashboard' into ↵ | Phil Hughes | 2017-06-26 | 17 | -739/+1228 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740 | ||||
* | | | | | Merge branch 'profile-settings-width' into 'master' | Annabel Dunstone Gray | 2017-06-28 | 15 | -40/+56 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Added limited width to profile settings Closes #20918 See merge request !12386 | ||||
| * | | | | Added limited width to profile settingsprofile-settings-width | Phil Hughes | 2017-06-23 | 15 | -40/+56 |
| | | | | | | | | | | | | | | | | | | | | Closes #20918 | ||||
* | | | | | Merge branch 'stop-notification-recipient-service-modifying-participants' ↵ | Grzegorz Bizon | 2017-06-28 | 1 | -7/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure NotificationRecipientService doesn't modify participants See merge request !12517 | ||||
| * | | | | | Ensure NotificationRecipientService doesn't modify participants | Sean McGivern | 2017-06-28 | 1 | -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 Zallmann | 2017-06-28 | 2 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix find file breadcrumb styling Closes #34427 See merge request !12510 | ||||
| * | | | | | | Fix find file breadcrumb stylingfix-find-file-breadcrumbs | Phil Hughes | 2017-06-28 | 2 | -1/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Closes #34427 | ||||
* | | | | | | Merge branch 'issue-boards-closed-list-all' into 'master' | Sean McGivern | 2017-06-28 | 1 | -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 issues | Phil Hughes | 2017-06-28 | 1 | -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 Hughes | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary call to `_.escape` Closes #34430 See merge request !12505 | ||||
| * | | | | | | Remove unnecessary call to `_.escape`34430-fix-double-escape-comment-edit | kushalpandya | 2017-06-28 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'submodules-private' into 'master' | Sean McGivern | 2017-06-28 | 1 | -16/+0 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | Make Gitlab::Git::Repository#submodules private See merge request !12479 | ||||
| * | | | | | | Make Gitlab::Ggit::Repository#submodules private | Jacob Vosmaer | 2017-06-27 | 1 | -16/+0 |
| | | | | | | | |||||
* | | | | | | | Resolve "Navigation - Move contextual navigation to sidebar" | Annabel Dunstone Gray | 2017-06-28 | 12 | -12/+623 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'backport-inline-loading-icon' into 'master' | Phil Hughes | 2017-06-28 | 1 | -2/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport inline prop on loading_icon from EE See merge request !12490 | ||||
| * | | | | | | | Backport inline loading_icon updates from EEbackport-inline-loading-icon | Eric Eastwood | 2017-06-27 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2246#note_33577729 | ||||
* | | | | | | | | Merge branch 'refactor-emoji-utils' into 'master' | Tim Zallmann | 2017-06-28 | 9 | -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-utils | Mike Greiling | 2017-06-27 | 1 | -2/+8 |
| | | | | | | | | |||||
| * | | | | | | | rename getEmojiCategoryMap and remove unnecessary parameter | Mike Greiling | 2017-06-27 | 2 | -9/+9 |
| | | | | | | | | |||||
| * | | | | | | | move glEmojiTag method to emoji helper | Mike Greiling | 2017-06-27 | 5 | -86/+67 |
| | | | | | | | | |||||
| * | | | | | | | split emoji support methods from the async module | Mike Greiling | 2017-06-27 | 5 | -10/+14 |
| | | | | | | | | |||||
| * | | | | | | | export validEmojiNames for autocomplete | Mike Greiling | 2017-06-26 | 2 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | replace emojiAlias references with normalizeEmojiName helper | Mike Greiling | 2017-06-26 | 1 | -5/+3 |
| | | | | | | | | |||||
| * | | | | | | | namespace emoji helper methods within AwardsHandler class | Mike Greiling | 2017-06-26 | 1 | -13/+8 |
| | | | | | | | | |||||
| * | | | | | | | move emoji category index to helper method | Mike Greiling | 2017-06-26 | 2 | -27/+32 |
| | | | | | | | | |||||
| * | | | | | | | move emojiAlias logic into helper module | Mike Greiling | 2017-06-26 | 2 | -16/+17 |
| | | | | | | | | |||||
| * | | | | | | | fix method definition styling | Mike Greiling | 2017-06-26 | 1 | -12/+2 |
| | | | | | | | | |||||
| * | | | | | | | move normalizeEmojiName method to emoji helper module | Mike Greiling | 2017-06-26 | 3 | -20/+14 |
| | | | | | | | | |||||
| * | | | | | | | remove problematic use of requestAnimationFrame | Mike Greiling | 2017-06-26 | 1 | -8/+2 |
| | | | | | | | | |||||
| * | | | | | | | centralize emoji helper methods | Mike Greiling | 2017-06-23 | 7 | -21/+22 |
| | | | | | | | | |||||
| * | | | | | | | refactor option defaults | Mike Greiling | 2017-06-23 | 1 | -5/+2 |
| | | | | | | | | |||||
* | | | | | | | | Ignore JSON files generated from PO files | Ruben Davila | 2017-06-27 | 9 | -9/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵ | Robert Speicher | 2017-06-27 | 2 | -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-nil | Ruben Davila | 2017-06-26 | 2 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Slightly refactor pipeline schedules form in preparation for additions | Bryce Johnson | 2017-06-27 | 3 | -155/+172 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'dm-commit-row-browse-button' into 'master' | Robert Speicher | 2017-06-27 | 1 | -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 buttons | Douwe Maan | 2017-06-22 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter ↵ | Luke "Jared" Bennett | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submits twice and refreshes page" | ||||
* | | | | | | | | | | Merge branch 'gitlab-git-find-commits' into 'master' | Sean McGivern | 2017-06-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up Gitlab::Git::Commit.find_all See merge request !12476 | ||||
| * | | | | | | | | | | Remove Gitlab::Git::Repository#find_all | Jacob Vosmaer | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | |