Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move webpack publicPath setup earlier in the bootstrap processes to avoid ES ↵ | Mike Greiling | 2017-06-28 | 4 | -10/+16 |
| | | | | module execution order issues | ||||
* | dynamically import emoji helpers for gl-emoji custom tag prototype | Mike Greiling | 2017-06-28 | 1 | -5/+12 |
| | |||||
* | dynamically import emoji helpers for GfmAutoComplete class | Mike Greiling | 2017-06-28 | 1 | -6/+12 |
| | |||||
* | dynamically import emoji helpers for AwardsHandler class | Mike Greiling | 2017-06-28 | 4 | -47/+61 |
| | |||||
* | dynamically set webpack publicPath when relative_url_root enabled | Mike Greiling | 2017-06-28 | 2 | -1/+8 |
| | |||||
* | ensure eslint recognizes es2015 dynamic import() syntax | Mike Greiling | 2017-06-28 | 3 | -1/+16 |
| | |||||
* | Merge branch 'bvl-fix-ldap-login' into 'master' | Douwe Maan | 2017-06-28 | 2 | -1/+11 |
|\ | | | | | | | | | Fix setting `last_credential_check_at` on LDAP-login See merge request !12507 | ||||
| * | Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-login | Bob Van Landuyt | 2017-06-28 | 2 | -1/+11 |
| | | |||||
* | | 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 'rc/a-better-stub-env' into 'master' | Grzegorz Bizon | 2017-06-28 | 1 | -9/+27 |
|\ \ \ | | | | | | | | | | | | | | | | | Use a slightly cleaner approach to stub ENV See merge request !12481 | ||||
| * | | | Use a slightly cleaner approach to stub ENVrc/a-better-stub-env | Rémy Coutable | 2017-06-28 | 1 | -9/+27 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch 'stop-notification-recipient-service-modifying-participants' ↵ | Grzegorz Bizon | 2017-06-28 | 3 | -7/+49 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure NotificationRecipientService doesn't modify participants See merge request !12517 | ||||
| * | | | | Ensure NotificationRecipientService doesn't modify participants | Sean McGivern | 2017-06-28 | 3 | -7/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -3/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression caused by the backlog list being re-added Closes #33850 | ||||
* | | | | | | Merge branch 'fix-duplicate-shared-examples' into 'master' | Grzegorz Bizon | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move shared examples to their correct location See merge request !12488 | ||||
| * | | | | | | Move share examples to their correct locationfix-duplicate-shared-examples | Rémy Coutable | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | Merge branch 'docs/introduce-ee-unified-docs' into 'master' | Achilleas Pipinellis | 2017-06-28 | 1 | -8/+20 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce unified docs to CE landing page See merge request !12482 | ||||
| * | | | | | | | adjust EE landing page to unify CE and EE docsdocs/introduce-ee-unified-docs | Marcia Ramos | 2017-06-27 | 1 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | == https://gitlab.com/gitlab-org/gitlab-ee/commit/30304bd2ab3c87d6304a3d4c4 bd71ab7ffd2794b from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2265 | ||||
* | | | | | | | | Merge branch 'patch-24' into 'master' | Rémy Coutable | 2017-06-28 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the numbering of steps in the 9.2 to 9.3 upgrade guide See merge request !12498 | ||||
| * | | | | | | | | Fix steps numbering | Nitin Madhok | 2017-06-27 | 1 | -3/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'dz-cleanup-codeclimate-json' into 'master' | Kamil Trzciński | 2017-06-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused data from code climate artifact See merge request !12494 | ||||
| * | | | | | | | | | Improve sed regex for codeclimate ci jobdz-cleanup-codeclimate-json | Dmitriy Zaporozhets | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Update .gitlab-ci.yml | Dmitriy Zaporozhets | 2017-06-27 | 0 | -0/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Remove unused data from code climate artifact | Dmitriy Zaporozhets | 2017-06-27 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | 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 'gitlab-git-test-in-tree' into 'master' | Rémy Coutable | 2017-06-28 | 13 | -2/+105 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor the gitlab-git-test repo Closes #32133 See merge request !12429 | ||||
| * | | | | | | | | | | | Vendor the gitlab-git-test repo | Jacob Vosmaer (GitLab) | 2017-06-28 | 13 | -2/+105 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'submodules-private' into 'master' | Sean McGivern | 2017-06-28 | 3 | -41/+30 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Gitlab::Git::Repository#submodules private See merge request !12479 | ||||
| * | | | | | | | | | | Make Gitlab::Ggit::Repository#submodules private | Jacob Vosmaer | 2017-06-27 | 3 | -41/+30 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '34023-navigation-sidebar' into 'master'34424-default-removing-source-branch-in-merge-request-for-non-long-running-branch | Phil Hughes | 2017-06-28 | 13 | -12/+624 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Navigation - Move contextual navigation to sidebar" Closes #34023 See merge request !12470 | ||||
| * | | | | | | | | | | Resolve "Navigation - Move contextual navigation to sidebar" | Annabel Dunstone Gray | 2017-06-28 | 13 | -12/+624 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | 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 | 11 | -175/+141 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -87/+68 |
| | | | | | | | | | | |||||
| * | | | | | | | | | split emoji support methods from the async module | Mike Greiling | 2017-06-27 | 7 | -12/+16 |
| | | | | | | | | | | |||||
| * | | | | | | | | | 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 |
| | | | | | | | | | |