summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* scale reCAPTCHA to be full width of the register form29000-style-captchaSimon Knox2017-06-292-3/+23
* Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-2910-12/+15
|\
| * Removes redundant pending delete checks30708-stop-using-deleted-at-to-filter-namespacesTiago Botelho2017-06-285-10/+10
| * Fix current feature related specsTiago Botelho2017-06-287-10/+13
| * Removes pending delete from filter scopesTiago Botelho2017-06-284-7/+6
| * refactors Project#search namespace joinTiago Botelho2017-06-281-0/+1
* | Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'Robert Speicher2017-06-283-4/+27
|\ \
| * | Drop default ORDER scope when calling a find method on a Sortable modelDouwe Maan2017-06-283-4/+27
* | | Merge branch 'acet-fix-job-sidebar-overflow' into 'master'Jacob Schatz2017-06-281-0/+1
|\ \ \
| * | | Jobs: Fix job sidebar overflow issue.acet-fix-job-sidebar-overflowFatih Acet2017-06-211-0/+1
* | | | Merge branch 'delete_esperanto_translations_of_json_files_generated_from_po_f...Douwe Maan2017-06-281-1/+0
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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-re...Phil Hughes2017-06-2617-739/+1228
* | | | | | | 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 'stop-notification-recipient-service-modifying-participants' int...Grzegorz Bizon2017-06-281-7/+10
|\ \ \ \ \ \ \
| * | | | | | | Ensure NotificationRecipientService doesn't modify participantsSean McGivern2017-06-281-7/+10
* | | | | | | | 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-281-2/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fixed issue boards closed list not listing all issuesPhil Hughes2017-06-281-2/+10
* | | | | | | | 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 'submodules-private' into 'master'Sean McGivern2017-06-281-16/+0
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | 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 loading_icon updates from EEbackport-inline-loading-iconEric Eastwood2017-06-271-2/+13
* | | | | | | | | | Merge branch 'refactor-emoji-utils' into 'master'Tim Zallmann2017-06-289-170/+137
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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