summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-171-20/+50
* Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-1712-227/+164
|\
| * fixed Karam test because of event name changeph-multi-file-editor-restructure-dataPhil Hughes2017-10-171-2/+2
| * Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-172-2/+15
| * fixed karma spec with prev directory buttonPhil Hughes2017-10-161-0/+1
| * fixed karma build because of a removed methodPhil Hughes2017-10-161-1/+1
| * fixed rendering bugsPhil Hughes2017-10-161-0/+1
| * Spec updatesPhil Hughes2017-10-1611-195/+150
| * Refactored multi-file data structurePhil Hughes2017-10-161-33/+0
* | Add inline edit button to issue_show appClement Ho2017-10-172-3/+47
* | Change project deletion message from alert to noticeWinnie Hellmann2017-10-171-1/+1
* | Merge branch 'move-user-avatar-specs' into 'master'Phil Hughes2017-10-173-0/+0
|\ \
| * | Move user avatar specs to folder to mimic javascript directorymove-user-avatar-specsClement Ho2017-10-163-0/+0
* | | Improve sprite icon specClement Ho2017-10-171-10/+18
* | | Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-173-30/+12
|\ \ \
| * | | Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-173-30/+12
* | | | Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-171-0/+17
|\ \ \ \
| * | | | Fix errors when deleting a forked projectBob Van Landuyt2017-10-171-0/+17
* | | | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-171-0/+10
|\ \ \ \ \
| * | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-161-0/+10
| | |/ / / | |/| | |
* | | | | Merge branch '39181-gitlab-backgroundmigration-deserializemergerequestdiffsan...Rémy Coutable2017-10-171-2/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-171-2/+19
* | | | | Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan2017-10-171-11/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow testing on Gitaly call countZeger-Jan van de Weg2017-10-161-11/+21
| |/ / /
* | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-177-44/+60
|\ \ \ \
| * | | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-172-1/+17
| * | | | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-175-43/+43
* | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-1734-433/+2941
|\ \ \ \ \
| * | | | | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-132-0/+18
| * | | | | Add support for `archived` paramkushalpandya2017-10-133-5/+9
| * | | | | Skip some nested group specs when using MySQLBob Van Landuyt2017-10-122-6/+16
| * | | | | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-122-270/+277
| * | | | | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-121-2/+2
| * | | | | Use polymorphism for common attributes in `GroupChildEntity`Bob Van Landuyt2017-10-121-1/+10
| * | | | | Fix spinach featuresBob Van Landuyt2017-10-113-3/+0
| * | | | | Always use the same order specs for `MultiCollectionPaginator`Bob Van Landuyt2017-10-111-1/+1
| * | | | | Handle archived projects in the `GroupDescendantsFinder`Bob Van Landuyt2017-10-112-6/+59
| * | | | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-10426-1721/+11276
| |\ \ \ \ \
| * | | | | | Move the `ancestors_upto` to `Project` and `Namespace`Bob Van Landuyt2017-10-102-0/+29
| * | | | | | Don't load unneeded elements in GroupsController#showBob Van Landuyt2017-10-102-45/+60
| * | | | | | Use `EXISTS` instead of `WHERE id IN (...)` for authorized groupsBob Van Landuyt2017-10-101-2/+11
| * | | | | | Only expand ancestors when searchingBob Van Landuyt2017-10-091-1/+12
| * | | | | | Hide "New subgroup" links when subgroups are not supportedBob Van Landuyt2017-10-051-0/+30
| * | | | | | Update feature specs for updated group listsBob Van Landuyt2017-10-053-41/+43
| * | | | | | Use `alias_attribute` & `alias_method` to define parent-methodsBob Van Landuyt2017-10-051-0/+7
| * | | | | | Optimize finding a membership for a user to avoid extra queriesBob Van Landuyt2017-10-051-2/+2
| * | | | | | Load counts everywhere we render a group treeBob Van Landuyt2017-10-052-12/+28
| * | | | | | Make sure all ancestors are loaded when searching groupsBob Van Landuyt2017-10-051-2/+2
| * | | | | | Optimize queries and pagination in `GroupDescendantsFinder`Bob Van Landuyt2017-10-051-0/+46
| * | | | | | Force parents to be preloaded for building a hierarchyBob Van Landuyt2017-10-052-19/+27