summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* configure webpack publicPath dynamically to account for CDN or relative path ...Mike Greiling2017-06-283-15/+23
* move webpack publicPath setup earlier in the bootstrap processes to avoid ES ...Mike Greiling2017-06-284-10/+16
* dynamically import emoji helpers for gl-emoji custom tag prototypeMike Greiling2017-06-281-5/+12
* dynamically import emoji helpers for GfmAutoComplete classMike Greiling2017-06-281-6/+12
* dynamically import emoji helpers for AwardsHandler classMike Greiling2017-06-284-47/+61
* dynamically set webpack publicPath when relative_url_root enabledMike Greiling2017-06-282-1/+8
* ensure eslint recognizes es2015 dynamic import() syntaxMike Greiling2017-06-283-1/+16
* Merge branch 'bvl-fix-ldap-login' into 'master'Douwe Maan2017-06-282-1/+11
|\
| * Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-loginBob Van Landuyt2017-06-282-1/+11
* | Merge branch 'profile-settings-width' into 'master'Annabel Dunstone Gray2017-06-2815-40/+56
|\ \
| * | Added limited width to profile settingsprofile-settings-widthPhil Hughes2017-06-2315-40/+56
* | | Merge branch 'rc/a-better-stub-env' into 'master'Grzegorz Bizon2017-06-281-9/+27
|\ \ \
| * | | Use a slightly cleaner approach to stub ENVrc/a-better-stub-envRémy Coutable2017-06-281-9/+27
* | | | Merge branch 'stop-notification-recipient-service-modifying-participants' int...Grzegorz Bizon2017-06-283-7/+49
|\ \ \ \
| * | | | Ensure NotificationRecipientService doesn't modify participantsSean McGivern2017-06-283-7/+49
* | | | | Merge branch 'fix-find-file-breadcrumbs' into 'master'Tim Zallmann2017-06-282-1/+3
|\ \ \ \ \
| * | | | | Fix find file breadcrumb stylingfix-find-file-breadcrumbsPhil Hughes2017-06-282-1/+3
| |/ / / /
* | | | | Merge branch 'issue-boards-closed-list-all' into 'master'Sean McGivern2017-06-283-3/+15
|\ \ \ \ \
| * | | | | Fixed issue boards closed list not listing all issuesPhil Hughes2017-06-283-3/+15
* | | | | | Merge branch 'fix-duplicate-shared-examples' into 'master'Grzegorz Bizon2017-06-281-1/+1
|\ \ \ \ \ \
| * | | | | | Move share examples to their correct locationfix-duplicate-shared-examplesRémy Coutable2017-06-271-1/+1
* | | | | | | Merge branch 'docs/introduce-ee-unified-docs' into 'master'Achilleas Pipinellis2017-06-281-8/+20
|\ \ \ \ \ \ \
| * | | | | | | adjust EE landing page to unify CE and EE docsdocs/introduce-ee-unified-docsMarcia Ramos2017-06-271-8/+20
* | | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-06-281-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix steps numberingNitin Madhok2017-06-271-3/+3
* | | | | | | | | Merge branch 'dz-cleanup-codeclimate-json' into 'master'Kamil Trzciński2017-06-281-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve sed regex for codeclimate ci jobdz-cleanup-codeclimate-jsonDmitriy Zaporozhets2017-06-271-1/+1
| * | | | | | | | | Update .gitlab-ci.ymlDmitriy Zaporozhets2017-06-270-0/+0
| * | | | | | | | | Remove unused data from code climate artifactDmitriy Zaporozhets2017-06-271-0/+1
* | | | | | | | | | Merge branch '34430-fix-double-escape-comment-edit' into 'master'Phil Hughes2017-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary call to `_.escape`34430-fix-double-escape-comment-editkushalpandya2017-06-281-1/+1
* | | | | | | | | | | Merge branch 'gitlab-git-test-in-tree' into 'master'Rémy Coutable2017-06-2813-2/+105
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Vendor the gitlab-git-test repoJacob Vosmaer (GitLab)2017-06-2813-2/+105
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-283-41/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-273-41/+30
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '34023-navigation-sidebar' into 'master'34424-default-removing-source-branch-in-merge-request-for-non-long-running-branchPhil Hughes2017-06-2813-12/+624
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Navigation - Move contextual navigation to sidebar"Annabel Dunstone Gray2017-06-2813-12/+624
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'backport-inline-loading-icon' into 'master'Phil Hughes2017-06-281-2/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Backport inline loading_icon updates from EEbackport-inline-loading-iconEric Eastwood2017-06-271-2/+13
* | | | | | | | | | Merge branch 'refactor-emoji-utils' into 'master'Tim Zallmann2017-06-2811-175/+141
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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-276-87/+68
| * | | | | | | | | split emoji support methods from the async moduleMike Greiling2017-06-277-12/+16
| * | | | | | | | | 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